diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-12 17:05:04 -0400 |
| commit | bf1728902bd3e81e00aa9786a5b1c67e4f30a659 (patch) | |
| tree | 857c914003fda2ec5223425a31b646cbafd9907b /cloudinit/sources/DataSourceOpenStack.py | |
| parent | e28ba310872846e0bc60595aed353c17b760fdcb (diff) | |
| parent | bc2c3267549b9067c017a34e22bbee18890aec06 (diff) | |
| download | vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.tar.gz vyos-cloud-init-bf1728902bd3e81e00aa9786a5b1c67e4f30a659.zip | |
Merge branch 'master' into ubuntu/devel
Diffstat (limited to 'cloudinit/sources/DataSourceOpenStack.py')
| -rw-r--r-- | cloudinit/sources/DataSourceOpenStack.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py index c06d17f3..82558214 100644 --- a/cloudinit/sources/DataSourceOpenStack.py +++ b/cloudinit/sources/DataSourceOpenStack.py @@ -138,7 +138,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource): vd = results.get('vendordata') self.vendordata_pure = vd try: - self.vendordata_raw = openstack.convert_vendordata_json(vd) + self.vendordata_raw = sources.convert_vendordata(vd) except ValueError as e: LOG.warn("Invalid content in vendor-data: %s", e) self.vendordata_raw = None |