Use identity api_v3 default value from tempest

* Since from Queens cycle, api_v3 is set to true and the openstack
  catalog list for identity does not provides the version and extension
  info. So better we can use the default value from tempest.config
  otherwise it will set api_v3 to false.

Change-Id: Ic02310262f46bb011dac20eaa28f85f224df4e76
This commit is contained in:
Chandan Kumar 2018-02-14 20:06:55 +05:30
parent ebfb56b0b6
commit 187471e3fd
1 changed files with 3 additions and 2 deletions

View File

@ -103,7 +103,7 @@ SERVICE_NAMES = {
# configurable in tempest.conf
SERVICE_VERSIONS = {
'image': {'supported_versions': ['v1', 'v2'], 'catalog': 'image'},
'identity': {'supported_versions': ['v2', 'v3'], 'catalog': 'identity'},
'identity': {'supported_versions': ['v2'], 'catalog': 'identity'},
'volume': {'supported_versions': ['v2', 'v3'], 'catalog': 'volumev3'}
}
@ -1048,7 +1048,8 @@ def configure_discovered_services(conf, services):
conf.set(section, 'api_' + version, str(is_supported))
# set service extensions
keystone_v3_support = conf.get('identity-feature-enabled', 'api_v3')
keystone_v3_support = conf.get_defaulted('identity-feature-enabled',
'api_v3')
for service, ext_key in SERVICE_EXTENSION_KEY.iteritems():
if service in services:
extensions = ','.join(services[service].get('extensions', ""))