summaryrefslogtreecommitdiff
path: root/cloudinit
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-02-18 12:58:21 -0500
committerScott Moser <smoser@ubuntu.com>2014-02-18 12:58:21 -0500
commita8668153b08a7e919e3795a5e93201fa99f7224c (patch)
treeb8f8e95efe465ccfadbdbcc85234fd1dbfaa17b2 /cloudinit
parent474a72c5b7492b64ff153f1abf694c079b137c4b (diff)
downloadvyos-cloud-init-a8668153b08a7e919e3795a5e93201fa99f7224c.tar.gz
vyos-cloud-init-a8668153b08a7e919e3795a5e93201fa99f7224c.zip
NoCloud: fix broken seed from external image
Diffstat (limited to 'cloudinit')
-rw-r--r--cloudinit/sources/DataSourceNoCloud.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py
index cbaac29f..8dc96ab6 100644
--- a/cloudinit/sources/DataSourceNoCloud.py
+++ b/cloudinit/sources/DataSourceNoCloud.py
@@ -90,7 +90,7 @@ class DataSourceNoCloud(sources.DataSource):
found.append("ds_config")
def _pp2d_callback(mp, data):
- util.pathprefix2dict(mp, **data)
+ return util.pathprefix2dict(mp, **data)
label = self.ds_cfg.get('fs_label', "cidata")
if label is not None:
@@ -110,7 +110,8 @@ class DataSourceNoCloud(sources.DataSource):
LOG.debug("Attempting to use data from %s", dev)
try:
- seeded = util.mount_cb(dev, _pp2d_callback)
+ seeded = util.mount_cb(dev, _pp2d_callback,
+ pp2d_kwargs)
except ValueError as e:
if dev in label_list:
LOG.warn("device %s with label=%s not a"
@@ -123,7 +124,7 @@ class DataSourceNoCloud(sources.DataSource):
# that is more likely to be what is desired. If they want
# dsmode of local, then they must specify that.
if 'dsmode' not in mydata['meta-data']:
- mydata['meta-data'] = "net"
+ mydata['dsmode'] = "net"
LOG.debug("Using data from %s", dev)
found.append(dev)