diff options
| author | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-06 19:36:31 -0800 |
|---|---|---|
| committer | Joshua Harlow <harlowja@yahoo-inc.com> | 2013-03-06 19:36:31 -0800 |
| commit | 1e4f41e900a9c942354428b0f312428af00031ce (patch) | |
| tree | b43a40ae2d63817998f6ed1ba3235170bace6c80 /cloudinit/sources/DataSourceConfigDrive.py | |
| parent | fc6aa5aa54ee35ff0a3eff823bae0d3cf9b34bc1 (diff) | |
| download | vyos-cloud-init-1e4f41e900a9c942354428b0f312428af00031ce.tar.gz vyos-cloud-init-1e4f41e900a9c942354428b0f312428af00031ce.zip | |
Make conf.d and the default merging use the new merging algos.
Diffstat (limited to 'cloudinit/sources/DataSourceConfigDrive.py')
| -rw-r--r-- | cloudinit/sources/DataSourceConfigDrive.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py index 46abd772..0216ed07 100644 --- a/cloudinit/sources/DataSourceConfigDrive.py +++ b/cloudinit/sources/DataSourceConfigDrive.py @@ -154,7 +154,7 @@ class DataSourceConfigDrive(sources.DataSource): return False md = results['metadata'] - md = util.mergedict(md, DEFAULT_METADATA) + md = util.mergemanydict([md, DEFAULT_METADATA]) # Perform some metadata 'fixups' # |