diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
| commit | 24365490c58df8f0ef2246838c81ec604f0311ac (patch) | |
| tree | 3a6e44277256d15bb215cef3c61799397a673e6e /cloudinit/sources/helpers/openstack.py | |
| parent | f16b906c987c7a7948c9adad8f32c1f786ca6569 (diff) | |
| parent | 18bf614ca1d9fbabdf83495e7675a2cacaf6c2f4 (diff) | |
| download | vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.tar.gz vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.zip | |
merge trunk at 0.7.7~bzr1189
Diffstat (limited to 'cloudinit/sources/helpers/openstack.py')
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index bd93d22f..1aa6bbae 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_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_LIBERTY, ) @@ -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): |