diff options
| author | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:30 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-01-10 11:25:30 -0500 |
| commit | 0a488598ea1f0ccc577bac780b5de2b522f278f9 (patch) | |
| tree | e5cf1056019eb1c9013e479d0eeb1412f6f0d9b7 | |
| parent | f0d495b80ac0b4b0a33c7fc7c6c3305a17dd8621 (diff) | |
| download | cloud-init-git-0a488598ea1f0ccc577bac780b5de2b522f278f9.tar.gz | |
Import version 0.7.5-0ubuntu1.12ubuntu/0.7.5-0ubuntu1.12
Imported using git-import-dsc
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/lp-1493453-nocloudds-vendor_data.patch | 16 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index ad305204..06f9ebf9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +cloud-init (0.7.5-0ubuntu1.12) trusty; urgency=medium + + * d/patches/lp-1493453-nocloudds-vendor_data.patch: + - fix vendor_data variable assignment for the NoCloud Datasource + (LP: #1493453). + + -- Ben Howard <ben.howard@ubuntu.com> Mon, 21 Sep 2015 15:24:17 -0600 + cloud-init (0.7.5-0ubuntu1.11) trusty; urgency=medium [ Felipe Reyes ] diff --git a/debian/patches/lp-1493453-nocloudds-vendor_data.patch b/debian/patches/lp-1493453-nocloudds-vendor_data.patch new file mode 100644 index 00000000..fe3c8aeb --- /dev/null +++ b/debian/patches/lp-1493453-nocloudds-vendor_data.patch @@ -0,0 +1,16 @@ +Description: Fix vendor_data assignment for NoCloud Datasource +Author: Ben Howard <ben.howard@ubuntu.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1493453 +Forwarded: https://bugs.launchpad.net/cloud-init/+bug/1493453 + +--- a/cloudinit/sources/DataSourceNoCloud.py ++++ b/cloudinit/sources/DataSourceNoCloud.py +@@ -190,7 +190,7 @@ + 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, md['dsmode']) diff --git a/debian/patches/series b/debian/patches/series index 8bd4a410..fd0fb920 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,3 +15,4 @@ lp-1470890-include-regions-in-dynamic-mirror-discovery.patch lp-1490796-azure-fix-mount_cb-for-symlinks.patch lp-1469260-fix-consumption-of-vendor-data.patch lp-1461242-generate-ed25519-host-keys.patch +lp-1493453-nocloudds-vendor_data.patch |