diff options
| author | Scott Moser <smoser@ubuntu.com> | 2014-07-21 14:33:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2014-07-21 14:33:27 -0400 |
| commit | 0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee (patch) | |
| tree | 658d3a3d0e2675a1738d65cc1260f2594877c360 /cloudinit/sources/DataSourceNoCloud.py | |
| parent | f9d18e2ed747a6d44e60547fbcc0bbff780f351f (diff) | |
| parent | 6a4976e8a9915680fbc91f90bed8fcfa79cba5cf (diff) | |
| download | vyos-cloud-init-0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee.tar.gz vyos-cloud-init-0dbd2a0ec71de2f9d8d631ae5241a948fc6a51ee.zip | |
merge from trunk
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 8dc96ab6..a315aae0 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -57,7 +57,7 @@ class DataSourceNoCloud(sources.DataSource): md = {} if parse_cmdline_data(self.cmdline_id, md): found.append("cmdline") - mydata.update(md) + mydata['meta-data'].update(md) except: util.logexc(LOG, "Unable to parse command line data") return False |