summaryrefslogtreecommitdiff
path: root/cloudinit/sources
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2012-08-23 17:13:50 -0400
committerScott Moser <smoser@ubuntu.com>2012-08-23 17:13:50 -0400
commit5d57d93ff5e505e081abf2ff98569aa00fe679da (patch)
treeede4178c6c45cd583558053ce222b44e5694de68 /cloudinit/sources
parent085ce6b6fcc86101b3c5cc6fe40f66451034f453 (diff)
downloadvyos-cloud-init-5d57d93ff5e505e081abf2ff98569aa00fe679da.tar.gz
vyos-cloud-init-5d57d93ff5e505e081abf2ff98569aa00fe679da.zip
fix pep8 and pylint
Diffstat (limited to 'cloudinit/sources')
-rw-r--r--cloudinit/sources/DataSourceConfigDrive.py16
1 files changed, 9 insertions, 7 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index 677483d0..cba499e4 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -60,11 +60,11 @@ class DataSourceConfigDrive(sources.DataSource):
def get_data(self):
found = None
md = {}
- ud = ""
+ results = {}
if os.path.isdir(self.seed_dir):
try:
- (md, ud, files, ver) = read_config_drive_dir(self.seed_dir)
+ results = read_config_drive_dir(self.seed_dir)
found = self.seed_dir
except NonConfigDriveDir:
util.logexc(LOG, "Failed reading config drive from %s",
@@ -84,7 +84,7 @@ class DataSourceConfigDrive(sources.DataSource):
for dev in devlist:
try:
- (md, ud, files, ver) = util.mount_cb(dev, read_config_drive_dir)
+ results = util.mount_cb(dev, read_config_drive_dir)
found = dev
break
except (NonConfigDriveDir, util.MountFailedError):
@@ -106,9 +106,8 @@ class DataSourceConfigDrive(sources.DataSource):
self.distro.apply_network(md['network-interfaces'])
self.seed = found
- self.metadata = md
- self.userdata_raw = ud
- self.version = ver
+ self.metadata = results['metadata']
+ self.userdata_raw = results.get('userdata')
if md['dsmode'] == self.dsmode:
return True
@@ -137,6 +136,7 @@ class DataSourceConfigDriveNet(DataSourceConfigDrive):
class NonConfigDriveDir(Exception):
pass
+
class BrokenConfigDriveDir(Exception):
pass
@@ -181,6 +181,7 @@ def read_config_drive_dir(source_dir):
last_e = exc
raise last_e
+
def read_config_drive_dir_v2(source_dir, version="latest"):
datafiles = (
('metadata',
@@ -222,7 +223,7 @@ def read_config_drive_dir_v2(source_dir, version="latest"):
files = {}
try:
- for item in results['metadata'].get('files',{}):
+ for item in results['metadata'].get('files', {}):
files[item['path']] = read_content_path(item)
item = results['metadata'].get("network_config", None)
@@ -235,6 +236,7 @@ def read_config_drive_dir_v2(source_dir, version="latest"):
results['cfgdrive_ver'] = 2
return results
+
def read_config_drive_dir_v1(source_dir):
"""
read source_dir, and return a tuple with metadata dict, user-data,