Commit 3c39c3f7 authored by Scott Moser's avatar Scott Moser

NoCloud: fix consumption of vendor-data

the content of vendordata was was being assigned to vendordata, 
rather than vendordata_raw.  The result was that it is not processed
for includes or part handlers or other things as it is in other
datasources.

LP: #1493453
parent f5de3d5c
......@@ -60,6 +60,7 @@
- rsyslog: add additional configuration mode (LP: #1478103)
- status_wrapper in main: fix use of print_exc when handling exception
- reporting: add reporting module for web hook or logging of events.
- NoCloud: fix consumption of vendordata (LP: #1493453)
0.7.6:
- open 0.7.6
- Enable vendordata on CloudSigma datasource (LP: #1303986)
......
......@@ -190,7 +190,7 @@ class DataSourceNoCloud(sources.DataSource):
self.seed = ",".join(found)
self.metadata = mydata['meta-data']
self.userdata_raw = mydata['user-data']
self.vendordata = mydata['vendor-data']
self.vendordata_raw = mydata['vendor-data']
return True
LOG.debug("%s: not claiming datasource, dsmode=%s", self,
......
......@@ -121,7 +121,7 @@ class TestNoCloudDataSource(TestCase):
ret = dsrc.get_data()
self.assertEqual(dsrc.userdata_raw, ud)
self.assertEqual(dsrc.metadata, md)
self.assertEqual(dsrc.vendordata, vd)
self.assertEqual(dsrc.vendordata_raw, vd)
self.assertTrue(ret)
def test_nocloud_no_vendordata(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment