diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-09 15:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-09 15:06:51 +0000 |
| commit | 59f719c931771f6fc5372ddde87c4674b3f7cd11 (patch) | |
| tree | 15dab7c92b42f4e0283e2c3c4328a1a7c25ab4f9 | |
| parent | 44b10db500af43636b1055078ba6ba547c40bc0d (diff) | |
| parent | 397da54db11b5a5506c24dc9af60a34665bbd953 (diff) | |
| download | os-client-config-59f719c931771f6fc5372ddde87c4674b3f7cd11.tar.gz | |
Merge "Workaround a dispute between osc and neutronclient"1.10.2
| -rw-r--r-- | os_client_config/cloud_config.py | 4 | ||||
| -rw-r--r-- | os_client_config/defaults.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index 37029f1..bace53e 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -258,6 +258,10 @@ class CloudConfig(object): constructor_args = [] if pass_version_arg: version = self.get_api_version(service_key) + # Temporary workaround while we wait for python-openstackclient + # to be able to handle 2.0 which is what neutronclient expects + if service_key == 'network' and version == '2': + version = '2.0' if service_key == 'identity': # keystoneclient takes version as a tuple. version = tuple(str(float(version)).split('.')) diff --git a/os_client_config/defaults.json b/os_client_config/defaults.json index d1b66a3..208641a 100644 --- a/os_client_config/defaults.json +++ b/os_client_config/defaults.json @@ -12,7 +12,7 @@ "image_api_use_tasks": false, "image_api_version": "2", "image_format": "qcow2", - "network_api_version": "2.0", + "network_api_version": "2", "object_api_version": "1", "orchestration_api_version": "1", "secgroup_source": "neutron", |