commit 0cb721b790baa8f2929f716dc8945f4bfd25f08f
author Zuul <zuul@review.opendev.org> Sat May 04 22:38:45 2019 +0000
committer Gerrit Code Review <review@openstack.org> Sat May 04 22:38:45 2019 +0000
tree f3b4703639bb6f0327b73bd7cc21e6556d1d53e7
parent 15b098d4701a21403cbb56746e68b9d94aad248d
parent a9a51ca6382eb01c99fce51084f64a69f4c7d58a

Merge "Fix is_neutron_legacy_enabled function"

lib/neutron

diff --git a/lib/neutron b/lib/neutron
index 1066d8e..947c491 100644
--- a/lib/neutron
+++ b/lib/neutron
@@ -117,7 +117,9 @@
 # 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
 }