openinfra/python-tempestconf
Code Issues Proposed changes

Remove old compatibility stuff for sahara

Browse Source 
The values have been stable since Kilo.

Change-Id: I665137f35f44bd135907a48a8dc216d56fd5680f
This commit is contained in:
Luigi Toscano
2017-03-09 14:57:22 +01:00
parent 08903197d3
commit 54e91ad476
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config_tempest/config_tempest.py
View File

@@ -770,9 +770,6 @@ def configure_discovered_services(conf, services):
# ceilometer is still transitioning from metering to telemetry # ceilometer is still transitioning from metering to telemetry
if service == 'telemetry' and 'metering' in services: if service == 'telemetry' and 'metering' in services:
service = 'metering' service = 'metering'
# data-processing is the default service name since Kilo
elif service == 'data-processing' and 'data_processing' in services:
service = 'data_processing'
conf.set('service_available', codename, str(service in services)) conf.set('service_available', codename, str(service in services))
# set supported API versions for services with more of them # set supported API versions for services with more of them

5
etc/default-overrides.conf
View File

@@ -72,11 +72,8 @@ operator_role=SwiftOperator
# User role that has reseller admin (string value) # User role that has reseller admin (string value)
#reseller_admin_role=ResellerAdmin $$$ DEPLOY #reseller_admin_role=ResellerAdmin $$$ DEPLOY
[data_processing] [data-processing]
# Changed in kilo from data_processing
# Catalog type of the data processing service. (string value)
catalog_type = data-processing
[orchestration] [orchestration]