From f2a05497a3716b5eaa178b970d5cd2e6db865a97 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 26 Jun 2015 15:20:54 +0200 Subject: [PATCH] Drop no longer needed and broken check for cinder in is_service_enabled There is properly working is_cinder_enabled now, and this check actualy matches ironic-inspector, breaking its devstack plugin. Change-Id: I659ec9b9b2b49690fd075f9766ae8cbf19e81848 Closes-Bug: #1469160 --- functions-common | 1 - 1 file changed, 1 deletion(-) diff --git a/functions-common b/functions-common index c85052d5b0..9054c335b6 100644 --- a/functions-common +++ b/functions-common @@ -1754,7 +1754,6 @@ function is_service_enabled { [[ ${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