summaryrefslogtreecommitdiff
path: root/cloudinit/sources/DataSourceOpenStack.py
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-08-23 16:48:41 -0400
committerScott Moser <smoser@brickies.net>2016-08-23 16:48:41 -0400
commit5994f3bc480c918d8756ab0cb8ecfa34975eb307 (patch)
tree893c47ee8e3523982081f600bf770ffd68a54ac7 /cloudinit/sources/DataSourceOpenStack.py
parent1355ce5e2b53b063cde2825b6df9de1cdd2b1797 (diff)
parentd75a912fb375afbab055db3178966d1f83b44143 (diff)
downloadvyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.tar.gz
vyos-cloud-init-5994f3bc480c918d8756ab0cb8ecfa34975eb307.zip
merge trunk at 0.7.7~bzr1200
Diffstat (limited to 'cloudinit/sources/DataSourceOpenStack.py')
-rw-r--r--cloudinit/sources/DataSourceOpenStack.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
index f7f4590b..3af17b10 100644
--- a/cloudinit/sources/DataSourceOpenStack.py
+++ b/cloudinit/sources/DataSourceOpenStack.py
@@ -45,8 +45,6 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
self.version = None
self.files = {}
self.ec2_metadata = None
- if not self.ds_cfg:
- self.ds_cfg = {}
def __str__(self):
root = sources.DataSource.__str__(self)