diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-03-27 15:22:14 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-03-27 15:22:14 -0400 |
| commit | cb03a028430902c79f82097230abb7120f366bbd (patch) | |
| tree | 2ace5887642563b82d845d79058d9274052c6876 | |
| parent | 25a05c3367e024fcee5da0b4f15b5ca599dd92f2 (diff) | |
| parent | bf52085a1fa3529329a5c48097a12a6e9b93eb22 (diff) | |
| download | vyos-cloud-init-cb03a028430902c79f82097230abb7120f366bbd.tar.gz vyos-cloud-init-cb03a028430902c79f82097230abb7120f366bbd.zip | |
merge from trunk
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 5 |
2 files changed, 4 insertions, 2 deletions
@@ -28,6 +28,7 @@ (LP: #1422388) - readurl, read_file_or_url returns bytes, user must convert as necessary - SmartOS: use v2 metadata service (LP: #1436417) [Daniel Watkins] + - NoCloud: fix local datasource claiming found without explicit dsmode 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py index c26a645c..6a861af3 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -124,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['dsmode'] = "net" + mydata['meta-data']['dsmode'] = "net" LOG.debug("Using data from %s", dev) found.append(dev) @@ -193,7 +193,8 @@ class DataSourceNoCloud(sources.DataSource): self.vendordata = mydata['vendor-data'] return True - LOG.debug("%s: not claiming datasource, dsmode=%s", self, md['dsmode']) + LOG.debug("%s: not claiming datasource, dsmode=%s", self, + mydata['meta-data']['dsmode']) return False |