cloud-init

Merge lp:~harlowja/cloud-init/ds-ud-fix into lp:~cloud-init-dev/cloud-init/trunk

  1. ds-ud-fix
  2. Merge into trunk
Proposed by Joshua Harlow
Status: Merged
Merged at revision: 632
Proposed branch: lp:~harlowja/cloud-init/ds-ud-fix
Merge into: lp:~cloud-init-dev/cloud-init/trunk
Diff against target: 22 lines (+2/-4)
1 file modified
cloudinit/sources/DataSourceNone.py (+2/-4)
To merge this branch: bzr merge lp:~harlowja/cloud-init/ds-ud-fix
Reviewer Review Type Date Requested Status
cloud-init Commiters Pending
Review via email: mp+120839@code.launchpad.net

Description of the change

Fix for http://paste.ubuntu.com/1160945/ when userdata should be a message and not a dict (oops).

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cloudinit/sources/DataSourceNone.py'
2--- cloudinit/sources/DataSourceNone.py 2012-08-20 19:20:26 +0000
3+++ cloudinit/sources/DataSourceNone.py 2012-08-22 17:38:33 +0000
4@@ -26,16 +26,14 @@
5 class DataSourceNone(sources.DataSource):
6 def __init__(self, sys_cfg, distro, paths, ud_proc=None):
7 sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc)
8- self.userdata = {}
9 self.metadata = {}
10 self.userdata_raw = ''
11
12 def get_data(self):
13 # If the datasource config has any provided 'fallback'
14 # userdata or metadata, use it...
15- if 'userdata' in self.ds_cfg:
16- self.userdata = self.ds_cfg['userdata']
17- self.userdata_raw = util.yaml_dumps(self.userdata)
18+ if 'userdata_raw' in self.ds_cfg:
19+ self.userdata_raw = self.ds_cfg['userdata_raw']
20 if 'metadata' in self.ds_cfg:
21 self.metadata = self.ds_cfg['metadata']
22 return True