diff --git a/config_tempest/config_tempest.py b/config_tempest/config_tempest.py index 9803521f..cb007471 100755 --- a/config_tempest/config_tempest.py +++ b/config_tempest/config_tempest.py @@ -786,6 +786,14 @@ def configure_discovered_services(conf, services): # set service extensions keystone_v3_support = conf.get('identity-feature-enabled', 'api_v3') + # Currently neutron ext-list provides available api-extension but + # does not provide enabled extension due to bug in dvr. + # So we are removing dvr from neutron api-extension list. + # We can remove dvr from extension list using network.remove-extension dvr + # https://bugs.launchpad.net/neutron/+bug/1450067 + if not conf.has_option('network', 'remove-extension'): + conf.set('network', 'remove-extension', '') + network_extension = conf.get('network', 'remove-extension') for service, ext_key in SERVICE_EXTENSION_KEY.iteritems(): if service in services: extensions = ','.join(services[service].get('extensions', "")) @@ -798,6 +806,11 @@ def configure_discovered_services(conf, services): conf.get("identity", "uri_v3")) extensions = list(set(extensions.split(',') + identity_v3_ext)) extensions = ','.join(extensions) + elif service == 'network' and network_extension: + extensions = set(str(extensions).split(',')) + remove_ext = set(network_extension.split(',')) + extensions = list(extensions.difference(remove_ext)) + extensions = ','.join(extensions) conf.set(service + '-feature-enabled', ext_key, extensions) diff --git a/releasenotes/notes/remove-network-extension-2baca1416c8103a7.yaml b/releasenotes/notes/remove-network-extension-2baca1416c8103a7.yaml new file mode 100644 index 00000000..faa92fd7 --- /dev/null +++ b/releasenotes/notes/remove-network-extension-2baca1416c8103a7.yaml @@ -0,0 +1,4 @@ +--- +features: + - Added network.remove-extension to remove + neutron api extensions.