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/DataSourceOVF.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/DataSourceOVF.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index ae139074..0530c4b7 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -94,11 +94,11 @@ class DataSourceOVF(sources.DataSource): (md_seed, ud) = util.read_seeded(seedfrom, timeout=None) LOG.debug("Using seeded cache data from %s", seedfrom) - md = util.mergedict(md, md_seed) + md = util.mergemanydict([md, md_seed]) found.append(seedfrom) # Now that we have exhausted any other places merge in the defaults - md = util.mergedict(md, defaults) + md = util.mergemanydict([md, defaults]) self.seed = ",".join(found) self.metadata = md |