x/cloud-init
Code Issues Proposed changes

merge from trunk

Browse Source
This commit is contained in:
Scott Moser 2015-03-27 15:22:14 -04:00
commit 54dc4735aa
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -28,6 +28,7 @@
(LP: #1422388) (LP: #1422388)
- readurl, read_file_or_url returns bytes, user must convert as necessary - readurl, read_file_or_url returns bytes, user must convert as necessary
- SmartOS: use v2 metadata service (LP: #1436417) [Daniel Watkins] - SmartOS: use v2 metadata service (LP: #1436417) [Daniel Watkins]
- NoCloud: fix local datasource claiming found without explicit dsmode
0.7.6: 0.7.6:
- open 0.7.6 - open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986) - Enable vendordata on CloudSigma datasource (LP: #1303986)

5
cloudinit/sources/DataSourceNoCloud.py
View File

@ -124,7 +124,7 @@ class DataSourceNoCloud(sources.DataSource):
# that is more likely to be what is desired. If they want # that is more likely to be what is desired. If they want
# dsmode of local, then they must specify that. # dsmode of local, then they must specify that.
if 'dsmode' not in mydata['meta-data']: if 'dsmode' not in mydata['meta-data']:
mydata['dsmode'] = "net" mydata['meta-data']['dsmode'] = "net"
LOG.debug("Using data from %s", dev) LOG.debug("Using data from %s", dev)
found.append(dev) found.append(dev)
@ -193,7 +193,8 @@ class DataSourceNoCloud(sources.DataSource):
self.vendordata = mydata['vendor-data'] self.vendordata = mydata['vendor-data']
return True 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 return False