From 2b85dabb802766e0b3b1949d744c8860c0cb838a Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Wed, 23 Mar 2016 11:05:22 -0500
Subject: configdata: parse and convert openstack network_data json to
 network_config

---
 cloudinit/sources/helpers/openstack.py | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'cloudinit/sources/helpers/openstack.py')

diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index bd93d22f..eb50a7be 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -51,11 +51,13 @@ OS_LATEST = 'latest'
 OS_FOLSOM = '2012-08-10'
 OS_GRIZZLY = '2013-04-04'
 OS_HAVANA = '2013-10-17'
+OS_KILO = '2015-10-15'
 # keep this in chronological order. new supported versions go at the end.
 OS_VERSIONS = (
     OS_FOLSOM,
     OS_GRIZZLY,
     OS_HAVANA,
+    OS_KILO,
 )
 
 
@@ -229,6 +231,11 @@ class BaseReader(object):
                 False,
                 load_json_anytype,
             )
+            files['networkdata'] = (
+                self._path_join("openstack", version, 'network_data.json'),
+                False,
+                load_json_anytype,
+            )
             return files
 
         results = {
@@ -334,7 +341,7 @@ class ConfigDriveReader(BaseReader):
             path = self._path_join(self.base_path, 'openstack')
             found = [d for d in os.listdir(path)
                      if os.path.isdir(os.path.join(path))]
-            self._versions = found
+            self._versions = sorted(found)
         return self._versions
 
     def _read_ec2_metadata(self):
@@ -490,3 +497,28 @@ def convert_vendordata_json(data, recurse=True):
                                            recurse=False)
         raise ValueError("vendordata['cloud-init'] cannot be dict")
     raise ValueError("Unknown data type for vendordata: %s" % type(data))
+
+
+def convert_networkdata_json(data, recurse=True):
+    """ data: a loaded json *object* (strings, arrays, dicts).
+    return something suitable for cloudinit networkdata_raw.
+
+    if data is:
+       None: return None
+       string: return string
+       list: return data
+             the list is then processed in UserDataProcessor
+       dict: return convert_networkdata_json(data.get('cloud-init'))
+    """
+    if not data:
+        return None
+    if isinstance(data, six.string_types):
+        return data
+    if isinstance(data, list):
+        return copy.deepcopy(data)
+    if isinstance(data, dict):
+        if recurse is True:
+            return convert_networkdata_json(data.get('cloud-init'),
+                                            recurse=False)
+        raise ValueError("networkdata['cloud-init'] cannot be dict")
+    raise ValueError("Unknown data type for networkdata: %s" % type(data))
-- 
cgit v1.2.3


From 6b79e2c6f9a7342163691be9e785cef1aa642541 Mon Sep 17 00:00:00 2001
From: Ryan Harper <ryan.harper@canonical.com>
Date: Wed, 23 Mar 2016 14:17:10 -0500
Subject: fix openstack versions s/KILO/LIBERY drop networkdata read helper

---
 cloudinit/sources/DataSourceConfigDrive.py |  2 +-
 cloudinit/sources/helpers/openstack.py     | 29 ++---------------------------
 2 files changed, 3 insertions(+), 28 deletions(-)

(limited to 'cloudinit/sources/helpers/openstack.py')

diff --git a/cloudinit/sources/DataSourceConfigDrive.py b/cloudinit/sources/DataSourceConfigDrive.py
index d84fab54..15dddefe 100644
--- a/cloudinit/sources/DataSourceConfigDrive.py
+++ b/cloudinit/sources/DataSourceConfigDrive.py
@@ -150,7 +150,7 @@ class DataSourceConfigDrive(openstack.SourceMixin, sources.DataSource):
         nd = results.get('networkdata')
         self.networkdata_pure = nd
         try:
-            self.network_json = openstack.convert_networkdata_json(nd)
+            self.network_json = util.load_json(nd)
         except ValueError as e:
             LOG.warn("Invalid content in network-data: %s", e)
             self.network_json = None
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py
index eb50a7be..1aa6bbae 100644
--- a/cloudinit/sources/helpers/openstack.py
+++ b/cloudinit/sources/helpers/openstack.py
@@ -51,13 +51,13 @@ OS_LATEST = 'latest'
 OS_FOLSOM = '2012-08-10'
 OS_GRIZZLY = '2013-04-04'
 OS_HAVANA = '2013-10-17'
-OS_KILO = '2015-10-15'
+OS_LIBERTY = '2015-10-15'
 # keep this in chronological order. new supported versions go at the end.
 OS_VERSIONS = (
     OS_FOLSOM,
     OS_GRIZZLY,
     OS_HAVANA,
-    OS_KILO,
+    OS_LIBERTY,
 )
 
 
@@ -497,28 +497,3 @@ def convert_vendordata_json(data, recurse=True):
                                            recurse=False)
         raise ValueError("vendordata['cloud-init'] cannot be dict")
     raise ValueError("Unknown data type for vendordata: %s" % type(data))
-
-
-def convert_networkdata_json(data, recurse=True):
-    """ data: a loaded json *object* (strings, arrays, dicts).
-    return something suitable for cloudinit networkdata_raw.
-
-    if data is:
-       None: return None
-       string: return string
-       list: return data
-             the list is then processed in UserDataProcessor
-       dict: return convert_networkdata_json(data.get('cloud-init'))
-    """
-    if not data:
-        return None
-    if isinstance(data, six.string_types):
-        return data
-    if isinstance(data, list):
-        return copy.deepcopy(data)
-    if isinstance(data, dict):
-        if recurse is True:
-            return convert_networkdata_json(data.get('cloud-init'),
-                                            recurse=False)
-        raise ValueError("networkdata['cloud-init'] cannot be dict")
-    raise ValueError("Unknown data type for networkdata: %s" % type(data))
-- 
cgit v1.2.3