summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceCloudStack.py2
-rw-r--r--cloudinit/sources/DataSourceConfigDrive.py2
-rw-r--r--cloudinit/sources/DataSourceEc2.py6
-rw-r--r--cloudinit/sources/DataSourceMAAS.py1
-rw-r--r--cloudinit/sources/DataSourceNoCloud.py2
5 files changed, 7 insertions, 6 deletions
diff --git a/cloudinit/sources/DataSourceCloudStack.py b/cloudinit/sources/DataSourceCloudStack.py
index b1817654..83c577e6 100644
--- a/cloudinit/sources/DataSourceCloudStack.py
+++ b/cloudinit/sources/DataSourceCloudStack.py
@@ -121,7 +121,7 @@ class DataSourceCloudStack(sources.DataSource):
None, self.metadata_address)
self.metadata = boto_utils.get_instance_metadata(self.api_ver,
self.metadata_address)
- LOG.debug("Crawl of metadata service took %s seconds",
+ LOG.debug("Crawl of metadata service took %s seconds",
int(time.time() - start_time))
return True
except Exception:
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index 5da1ffea..9905dad4 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -36,7 +36,7 @@ CFG_DRIVE_FILES = [
"meta.js",
]
DEFAULT_METADATA = {
- "instance-id": DEFAULT_IID,
+ "instance-id": DEFAULT_IID,
"dsmode": DEFAULT_MODE,
}
CFG_DRIVE_DEV_ENV = 'CLOUD_INIT_CONFIG_DRIVE_DEVICE'
diff --git a/cloudinit/sources/DataSourceEc2.py b/cloudinit/sources/DataSourceEc2.py
index 55447102..0598dfa2 100644
--- a/cloudinit/sources/DataSourceEc2.py
+++ b/cloudinit/sources/DataSourceEc2.py
@@ -38,7 +38,7 @@ DEF_MD_URL = "http://169.254.169.254"
DEF_MD_VERSION = '2009-04-04'
# Default metadata urls that will be used if none are provided
-# They will be checked for 'resolveability' and some of the
+# They will be checked for 'resolveability' and some of the
# following may be discarded if they do not resolve
DEF_MD_URLS = [DEF_MD_URL, "http://instance-data:8773"]
@@ -69,7 +69,7 @@ class DataSourceEc2(sources.DataSource):
None, self.metadata_address)
self.metadata = boto_utils.get_instance_metadata(self.api_ver,
self.metadata_address)
- LOG.debug("Crawl of metadata service took %s seconds",
+ LOG.debug("Crawl of metadata service took %s seconds",
int(time.time() - start_time))
return True
except Exception:
@@ -201,7 +201,7 @@ class DataSourceEc2(sources.DataSource):
return None
# Example:
- # 'block-device-mapping':
+ # 'block-device-mapping':
# {'ami': '/dev/sda1',
# 'ephemeral0': '/dev/sdb',
# 'root': '/dev/sda1'}
diff --git a/cloudinit/sources/DataSourceMAAS.py b/cloudinit/sources/DataSourceMAAS.py
index bb8fbac1..104e7a54 100644
--- a/cloudinit/sources/DataSourceMAAS.py
+++ b/cloudinit/sources/DataSourceMAAS.py
@@ -251,6 +251,7 @@ datasources = [
(DataSourceMAAS, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
]
+
# Return a list of data sources that match this set of dependencies
def get_datasource_list(depends):
return sources.list_from_depends(depends, datasources)
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index 2b016d1c..8499a97c 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -154,7 +154,7 @@ class DataSourceNoCloud(sources.DataSource):
(self.dsmode in ("local", seeded_interfaces))):
LOG.info("Updating network interfaces from %s", self)
self.distro.apply_network(md['network-interfaces'])
-
+
if md['dsmode'] == self.dsmode:
self.seed = ",".join(found)
self.metadata = md