openinfra/python-tempestconf
Code Issues Proposed changes

Merge "Fix object store feature-enabled config"

Browse Source
This commit is contained in:
Zuul 2018-07-02 15:52:16 +00:00 committed by Gerrit Code Review
commit 080ee3738f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config_tempest/services/services.py
View File

@ -240,6 +240,10 @@ class Services(object):
supported_versions = [] supported_versions = []
else: else:
supported_versions = service_object.get_versions() supported_versions = service_object.get_versions()
# FIXME: object-store config param object-storage needs to be
# handled here In future this should be removed from Services class
if service == 'object-store':
service = 'object-storage'
section = service + '-feature-enabled' section = service + '-feature-enabled'
for version in service_info['supported_versions']: for version in service_info['supported_versions']:
is_supported = any(version in item is_supported = any(version in item
@ -271,4 +275,8 @@ class Services(object):
service_object = self.get_service(service) service_object = self.get_service(service)
if service_object is not None: if service_object is not None:
extensions = ','.join(service_object.get_extensions()) extensions = ','.join(service_object.get_extensions())
# FIXME: object-store config param object-storage needs to be
# handled here In future this should be removed from Services class
if service == 'object-store':
service = 'object-storage'
self._conf.set(service + postfix, ext_key, extensions) self._conf.set(service + postfix, ext_key, extensions)