From 54e91ad476bca93176dab05a8f8b77db3cebf79b Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Thu, 9 Mar 2017 14:57:22 +0100 Subject: [PATCH] Remove old compatibility stuff for sahara The values have been stable since Kilo. Change-Id: I665137f35f44bd135907a48a8dc216d56fd5680f --- config_tempest/config_tempest.py | 3 --- etc/default-overrides.conf | 5 +---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/config_tempest/config_tempest.py b/config_tempest/config_tempest.py index cb007471..8b591834 100755 --- a/config_tempest/config_tempest.py +++ b/config_tempest/config_tempest.py @@ -770,9 +770,6 @@ def configure_discovered_services(conf, services): # ceilometer is still transitioning from metering to telemetry if service == 'telemetry' and 'metering' in services: 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)) # set supported API versions for services with more of them diff --git a/etc/default-overrides.conf b/etc/default-overrides.conf index c690dab0..a0b44d62 100644 --- a/etc/default-overrides.conf +++ b/etc/default-overrides.conf @@ -72,11 +72,8 @@ operator_role=SwiftOperator # User role that has reseller admin (string value) #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]