commit 40a3829508f70ea8fd37fbe97195623f225c2c93 (HEAD)
Author: Scott Moser <smoser@brickies.net>
Date: Thu Jun 1 11:45:45 2017 -0400
smoser fixups
- fix up comment spelling
- drop unused change.
- capital letters are for global vars
diff --git a/cloudinit/sources/DataSourceAzure.py b/cloudinit/sources/DataSourceAzure.py
index 3e240aab..a0b9eaef 100644
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@ -321,7 +321,7 @@ class DataSourceAzureNet(sources.DataSource):
def get_data(self):
# azure removes/ejects the cdrom containing the ovf-env.xml
# file on reboot. So, in order to successfully reboot we
- # need to look in the datadir and consider that valida
+ # need to look in the datadir and consider that valid
asset_tag = util.read_dmi_data('chassis-asset-tag')
if asset_tag != AZURE_CHASSIS_ASSET_TAG:
LOG.debug("Non-Azure DMI asset tag '%s' discovered.", asset_tag)
@@ -819,7 +819,7 @@ def list_possible_azure_ds_devs():
return devlist
-def load_azure_ds_dir(source_dir, device=None):
+def load_azure_ds_dir(source_dir):
ovf_file = os.path.join(source_dir, "ovf-env.xml")
if not os.path.isfile(ovf_file):
diff --git a/tools/ds-identify b/tools/ds-identify
index 252dfc8a..546e0f59 100755
--- a/tools/ds-identify
+++ b/tools/ds-identify
@@ -664,8 +664,8 @@ dscheck_Azure() {
# UUID="112D211272645f72" LABEL="rd_rdfe_stable.161212-1209"
# TYPE="udf">/dev/sr0</device>
#
- local AZURE_CHASSIS="7783-7084-3265-9085-8269-3286-77"
- dmi_chassis_asset_tag_matches $AZURE_CHASSIS && return $DS_FOUND
+ local azure_chassis="7783-7084-3265-9085-8269-3286-77"
+ dmi_chassis_asset_tag_matches "${azure_chassis}" && return $DS_FOUND
check_seed_dir azure ovf-env.xml && return ${DS_FOUND}
[ "${DI_VIRT}" = "microsoft" ] || return ${DS_NOT_FOUND}