diff options
| author | Johann Queuniet <jqueuniet@users.noreply.github.com> | 2020-09-18 18:02:15 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 14:02:15 -0400 |
| commit | 6b5c306b537aafeded249fc82a3317fba8214508 (patch) | |
| tree | dd84ba783caca4c5cc76fd8899ada25759a6d65b /cloudinit/sources | |
| parent | 5fc34d81a002f6ca0706f5285ee15b919c3d8d2e (diff) | |
| download | vyos-cloud-init-6b5c306b537aafeded249fc82a3317fba8214508.tar.gz vyos-cloud-init-6b5c306b537aafeded249fc82a3317fba8214508.zip | |
Add vendor-data support to seedfrom parameter for NoCloud and OVF (#570)
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/DataSourceNoCloud.py | 3 | ||||
| -rw-r--r-- | cloudinit/sources/DataSourceOVF.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceNoCloud.py b/cloudinit/sources/DataSourceNoCloud.py index e408d730..d4a175e8 100644 --- a/cloudinit/sources/DataSourceNoCloud.py +++ b/cloudinit/sources/DataSourceNoCloud.py @@ -157,13 +157,14 @@ class DataSourceNoCloud(sources.DataSource): # This could throw errors, but the user told us to do it # so if errors are raised, let them raise - (md_seed, ud) = util.read_seeded(seedfrom, timeout=None) + (md_seed, ud, vd) = util.read_seeded(seedfrom, timeout=None) LOG.debug("Using seeded cache data from %s", seedfrom) # Values in the command line override those from the seed mydata['meta-data'] = util.mergemanydict([mydata['meta-data'], md_seed]) mydata['user-data'] = ud + mydata['vendor-data'] = vd found.append(seedfrom) # Now that we have exhausted any other places merge in the defaults diff --git a/cloudinit/sources/DataSourceOVF.py b/cloudinit/sources/DataSourceOVF.py index e53d2eb1..a5ccb8f6 100644 --- a/cloudinit/sources/DataSourceOVF.py +++ b/cloudinit/sources/DataSourceOVF.py @@ -73,6 +73,7 @@ class DataSourceOVF(sources.DataSource): found = [] md = {} ud = "" + vd = "" vmwareImcConfigFilePath = None nicspath = None @@ -304,7 +305,7 @@ class DataSourceOVF(sources.DataSource): seedfrom, self) return False - (md_seed, ud) = util.read_seeded(seedfrom, timeout=None) + (md_seed, ud, vd) = util.read_seeded(seedfrom, timeout=None) LOG.debug("Using seeded cache data from %s", seedfrom) md = util.mergemanydict([md, md_seed]) @@ -316,6 +317,7 @@ class DataSourceOVF(sources.DataSource): self.seed = ",".join(found) self.metadata = md self.userdata_raw = ud + self.vendordata_raw = vd self.cfg = cfg return True |