openstack/devstack
Code Issues Proposed changes

Fix is_neutron_legacy_enabled function

Browse Source 
This function will now first filter out all "neutron-" strings from
DISABLED_SERVICES list before looking for "neutron" string in it.

Change-Id: I5cab6a3be553713e1257599fb72042c6001f2672
Close-Bug: #1824884
This commit is contained in:
Slawek Kaplonski
2019-04-15 23:54:31 +02:00
parent 7fbc70e2cb
commit a9a51ca638
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/neutron
View File

@@ -117,7 +117,9 @@ function is_neutron_enabled {
# Test if any Neutron services are enabled # Test if any Neutron services are enabled
# is_neutron_enabled # is_neutron_enabled
function is_neutron_legacy_enabled { function is_neutron_legacy_enabled {
[[ ,${DISABLED_SERVICES} =~ ,"neutron" ]] && return 1 # first we need to remove all "neutron-" from DISABLED_SERVICES list
disabled_services_copy=$(echo $DISABLED_SERVICES | sed 's/neutron-//g')
[[ ,${disabled_services_copy} =~ ,"neutron" ]] && return 1
[[ ,${ENABLED_SERVICES} =~ ,"q-" ]] && return 0 [[ ,${ENABLED_SERVICES} =~ ,"q-" ]] && return 0
return 1 return 1
} }