x/deb-os-client-config
Code Issues Proposed changes

Merge "Workaround a dispute between osc and neutronclient"

Browse Source
This commit is contained in:
Jenkins 2015-11-09 15:06:51 +00:00 committed by Gerrit Code Review
commit 59f719c931
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os_client_config/cloud_config.py
View File

@ -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('.'))

2
os_client_config/defaults.json
View File

@ -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",