@@ -206,9 +206,12 @@ function start_ceilometer {

     screen_it ceilometer-collector "cd ; ceilometer-collector --config-file $CEILOMETER_CONF"

     screen_it ceilometer-api "cd ; ceilometer-api -d -v --log-dir=$CEILOMETER_API_LOG_DIR --config-file $CEILOMETER_CONF"

-    echo "Waiting for ceilometer-api to start..."

-    if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s http://localhost:8777/v2/ >/dev/null; do sleep 1; done"; then

-        die $LINENO "ceilometer-api did not start"

+    # only die on API if it was actually intended to be turned on

+    if service_enabled ceilometer-api; then

+        echo "Waiting for ceilometer-api to start..."

+        if ! timeout $SERVICE_TIMEOUT sh -c "while ! curl --noproxy '*' -s http://localhost:8777/v2/ >/dev/null; do sleep 1; done"; then

+            die $LINENO "ceilometer-api did not start"

+        fi

     fi

     screen_it ceilometer-alarm-notifier "cd ; ceilometer-alarm-notifier --config-file $CEILOMETER_CONF"