From 3e3e9e90c7eefe2e0a14f9055d23856939aea269 Mon Sep 17 00:00:00 2001 From: Joshua Harlow Date: Wed, 22 Aug 2012 10:35:22 -0700 Subject: Fix the userdata being populated to a dict (incorrect) and let it instead be populated by the userdata processor with the raw userdata (either empty or datasource config provided). --- cloudinit/sources/DataSourceNone.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'cloudinit/sources') diff --git a/cloudinit/sources/DataSourceNone.py b/cloudinit/sources/DataSourceNone.py index b186113c..c2125bee 100644 --- a/cloudinit/sources/DataSourceNone.py +++ b/cloudinit/sources/DataSourceNone.py @@ -26,16 +26,14 @@ LOG = logging.getLogger(__name__) class DataSourceNone(sources.DataSource): def __init__(self, sys_cfg, distro, paths, ud_proc=None): sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc) - self.userdata = {} self.metadata = {} self.userdata_raw = '' def get_data(self): # If the datasource config has any provided 'fallback' # userdata or metadata, use it... - if 'userdata' in self.ds_cfg: - self.userdata = self.ds_cfg['userdata'] - self.userdata_raw = util.yaml_dumps(self.userdata) + if 'userdata_raw' in self.ds_cfg: + self.userdata_raw = self.ds_cfg['userdata_raw'] if 'metadata' in self.ds_cfg: self.metadata = self.ds_cfg['metadata'] return True -- cgit v1.2.3