commit d014727c45db414b6e863f77916e7663ba5b425f
author Jenkins <jenkins@review.openstack.org> Tue Jun 30 16:55:31 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Jun 30 16:55:31 2015 +0000
tree 93fbd8434734cd4f2879bcaa1ed2ffed728ac5bf
parent e439dbe9d454558726d0013becb957027ae98621
parent f2a05497a3716b5eaa178b970d5cd2e6db865a97

Merge "Drop no longer needed and broken check for cinder in is_service_enabled"

functions-common

diff --git a/functions-common b/functions-common
index 061a935..0279167 100644
--- a/functions-common
+++ b/functions-common
@@ -1754,7 +1754,6 @@
         [[ ${service} == n-cell-* && ${ENABLED_SERVICES} =~ "n-cell" ]] && enabled=0
         [[ ${service} == n-cpu-* && ${ENABLED_SERVICES} =~ "n-cpu" ]] && enabled=0
         [[ ${service} == "nova" && ${ENABLED_SERVICES} =~ "n-" ]] && enabled=0
-        [[ ${service} == "cinder" && ${ENABLED_SERVICES} =~ "c-" ]] && enabled=0
         [[ ${service} == "ceilometer" && ${ENABLED_SERVICES} =~ "ceilometer-" ]] && enabled=0
         [[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && enabled=0
         [[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && enabled=0