Merge "Switch to _is_client_version in list_services"

This commit is contained in:
Jenkins 2017-08-30 17:17:09 +00:00 committed by Gerrit Code Review
commit 83491e309c

View File

@ -807,7 +807,7 @@ class OperatorCloud(openstackcloud.OpenStackCloud):
:raises: ``OpenStackCloudException`` if something goes wrong during the :raises: ``OpenStackCloudException`` if something goes wrong during the
openstack API call. openstack API call.
""" """
if self.cloud_config.get_api_version('identity').startswith('2'): if self._is_client_version('identity', 2):
url, key = '/OS-KSADM/services', 'OS-KSADM:services' url, key = '/OS-KSADM/services', 'OS-KSADM:services'
else: else:
url, key = '/services', 'services' url, key = '/services', 'services'