openstack
/
devstack
Code Issues Proposed changes

Merge "Fix is_neutron_legacy_enabled function"

This commit is contained in:
Zuul 2019-05-04 22:38:45 +00:00 committed by Gerrit Code Review
parent 15b098d470 a9a51ca638
commit 0cb721b790
1 changed files with 3 additions and 1 deletions
Show Stats 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
# is_neutron_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
return 1
}