From 36a31ff3f5ddd1e96be366bc1010d92b0fc1708a Mon Sep 17 00:00:00 2001
From: gord chung <gord@live.ca>
Date: Wed, 14 Jun 2017 21:50:54 +0000
Subject: use gnocchi devstack script

check to see if gnocchi enabled independently via enable_plugin.
if so, let it do it's thing.

Change-Id: Idabbf9b6e874875f8dd3bad52501966385823395
---
 devstack/plugin.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'devstack')

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 4c79927e..7e2dbfdf 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -183,7 +183,7 @@ function ceilometer_create_accounts {
         get_or_add_user_project_role "ResellerAdmin" "ceilometer" $SERVICE_PROJECT_NAME
     fi
 
-    if [ "$CEILOMETER_BACKEND" == "gnocchi" ]; then
+    if ! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && [ "$CEILOMETER_BACKEND" == "gnocchi" ]; then
         create_service_user "gnocchi"
         local gnocchi_service=$(get_or_create_service "gnocchi" \
             "metric" "OpenStack Metric Service")
@@ -432,7 +432,7 @@ function install_ceilometer {
         _ceilometer_prepare_coordination
     fi
 
-    [ "$CEILOMETER_BACKEND" = 'gnocchi' ] && install_gnocchi
+    ! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && [ "$CEILOMETER_BACKEND" = 'gnocchi' ] && install_gnocchi
 
     if is_service_enabled ceilometer-api; then
         _ceilometer_prepare_storage_backend
@@ -461,7 +461,7 @@ function install_ceilometerclient {
 # start_ceilometer() - Start running processes, including screen
 function start_ceilometer {
 
-    if [ "$CEILOMETER_BACKEND" = "gnocchi" ] ; then
+    if ! [[ $DEVSTACK_PLUGINS =~ 'gnocchi' ]] && [ "$CEILOMETER_BACKEND" = "gnocchi" ] ; then
         run_process gnocchi-api "$CEILOMETER_BIN_DIR/uwsgi --ini $GNOCCHI_UWSGI_FILE" ""
         run_process gnocchi-metricd "$CEILOMETER_BIN_DIR/gnocchi-metricd --config-file $GNOCCHI_CONF"
         wait_for_service 30 "$(gnocchi_service_url)"
-- 
cgit v1.2.1