summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Faulkner <jay@jvf.cc>2014-09-10 09:01:42 -0700
committerJay Faulkner <jay@jvf.cc>2014-09-10 09:01:42 -0700
commit6386accbf4933ecb368d2f32b7db95583e03b525 (patch)
treecfe931f13a8314caea2eea5ee9cf8916c561ca5a
parent822000955100179f9f5944e0b2403c95fac39458 (diff)
downloadvyos-cloud-init-6386accbf4933ecb368d2f32b7db95583e03b525.tar.gz
vyos-cloud-init-6386accbf4933ecb368d2f32b7db95583e03b525.zip
Only use vendordata under cloud-init key for ConfigDrive
This data will be treated the same as vendordata from other sources.
-rw-r--r--cloudinit/sources/DataSourceConfigDrive.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index 2456bc2e..83cc6b25 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -132,8 +132,6 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
# for cloud-init (for namespacing).
if 'cloud-init' in vd:
self.vendordata_raw = vd['cloud-init']
- else:
- self.vendordata_raw = vd
return True