diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-02-07 08:33:48 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-02-07 08:33:48 -0500 |
| commit | bf0db8d0793c9c18871cbbafbbad9c127b0bd8ee (patch) | |
| tree | 68a98bce70f56b7bcb1eb95ce26e846cac54eec2 /cloudinit/sources/DataSourceNoCloud.py | |
| parent | f3b25e68ac6d28cdacf7408c91da6e9a215ad1e6 (diff) | |
| download | vyos-cloud-init-bf0db8d0793c9c18871cbbafbbad9c127b0bd8ee.tar.gz vyos-cloud-init-bf0db8d0793c9c18871cbbafbbad9c127b0bd8ee.zip | |
user-data doesn't merge in from meta-data (typo)
Diffstat (limited to 'cloudinit/sources/DataSourceNoCloud.py')
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py index d8484437..5ccd6b99 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -80,7 +80,7 @@ class DataSourceNoCloud(sources.DataSource): # if ds_cfg has 'user-data' and 'meta-data' if 'user-data' in self.ds_cfg and 'meta-data' in self.ds_cfg: if self.ds_cfg['user-data']: - ud = util.mergedict(md, self.ds_cfg['user-data']) + ud = self.ds_cfg['user-data'] if self.ds_cfg['meta-data'] is not False: md = util.mergedict(md, self.ds_cfg['meta-data']) if 'ds_config' not in found: |