From f331366d2e8496674491b60bd1d4046d166c9463 Mon Sep 17 00:00:00 2001
From: venkatamahesh <venkatamaheshkotha@gmail.com>
Date: Sun, 15 Nov 2015 22:53:11 +0530
Subject: [PATCH] Move global variables to settings file

The global variables are moved to settings file as per
the devstack plug-ins documentation

Change-Id: Ib6f84ecaf01259c4d093df92d90d622927483033
---
 devstack/README.rst |  2 +-
 devstack/plugin.sh  | 56 --------------------------------------------
 devstack/settings   | 57 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+), 57 deletions(-)
 mode change 100644 => 100755 devstack/plugin.sh

diff --git a/devstack/README.rst b/devstack/README.rst
index cd6a51b9..c40c57aa 100644
--- a/devstack/README.rst
+++ b/devstack/README.rst
@@ -30,7 +30,7 @@ Configure DevStack to run CloudKitty
         $ cd ${DEVSTACK_DIR}
         cat >> local.conf << EOF
         # cloudkitty
-        enable_plugin cloudkitty https://github.com/openstack/cloudkitty master
+        enable_plugin cloudkitty https://git.openstack.org/openstack/cloudkitty master
         EOF
 
 Run devstack as normal::
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
old mode 100644
new mode 100755
index db44a4ed..5589c753
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -31,21 +31,6 @@ XTRACE=$(set +o | grep xtrace)
 set +o xtrace
 
 
-# Defaults
-# --------
-
-# Set up default directories
-CLOUDKITTY_DIR=$DEST/cloudkitty
-CLOUDKITTY_CONF_DIR=/etc/cloudkitty
-CLOUDKITTY_CONF=$CLOUDKITTY_CONF_DIR/cloudkitty.conf
-CLOUDKITTY_API_LOG_DIR=/var/log/cloudkitty
-CLOUDKITTY_AUTH_CACHE_DIR=${CLOUDKITTY_AUTH_CACHE_DIR:-/var/cache/cloudkitty}
-CLOUDKITTY_REPORTS_DIR=${DATA_DIR}/cloudkitty/reports
-# Horizon enabled file
-CLOUDKITTY_DASHBOARD=$DEST/cloudkitty-dashboard/cloudkittydashboard
-CLOUDKITTY_ENABLED_DIR=${CLOUDKITTY_ENABLED_DIR:-${CLOUDKITTY_DASHBOARD}/enabled}
-CLOUDKITTY_HORIZON_ENABLED_DIR=${CLOUDKITTY_HORIZON_ENABLED_DIR:-$HORIZON_DIR/openstack_dashboard/enabled}
-
 # Support potential entry-points console scripts
 if [[ -d $CLOUDKITTY_DIR/bin ]]; then
     CLOUDKITTY_BIN_DIR=$CLOUDKITTY_DIR/bin
@@ -53,47 +38,6 @@ else
     CLOUDKITTY_BIN_DIR=$(get_python_exec_prefix)
 fi
 
-# Set up database backend
-CLOUDKITTY_BACKEND=${CLOUDKITTY_BACKEND:-sqlite}
-
-# Set cloudkitty repository
-CLOUDKITTY_REPO=${CLOUDKITTY_REPO:-${GIT_BASE}/openstack/cloudkitty.git}
-CLOUDKITTY_BRANCH=${CLOUDKITTY_BRANCH:-master}
-
-# Set CloudKitty connection info
-CLOUDKITTY_SERVICE_HOST=${CLOUDKITTY_SERVICE_HOST:-$SERVICE_HOST}
-CLOUDKITTY_SERVICE_PORT=${CLOUDKITTY_SERVICE_PORT:-8888}
-CLOUDKITTY_SERVICE_HOSTPORT="$CLOUDKITTY_SERVICE_HOST:$CLOUDKITTY_SERVICE_PORT"
-CLOUDKITTY_SERVICE_PROTOCOL=${CLOUDKITTY_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
-
-# Set CloudKitty auth info
-CLOUDKITTY_PRICING_USER=${CLOUDKITTY_PRICING_USER:-"admin"}
-CLOUDKITTY_PRICING_PASSWORD=${CLOUDKITTY_PRICING_PASSWORD:-$ADMIN_PASSWORD}
-CLOUDKITTY_PRICING_TENANT=${CLOUDKITTY_PRICING_TENANT:-"demo"}
-
-# Set CloudKitty collect info
-CLOUDKITTY_COLLECTOR=${CLOUDKITTY_COLLECTOR:-ceilometer}
-CLOUDKITTY_SERVICES=${CLOUDKITTY_SERVICES:-compute}
-
-# Set CloudKitty output info
-CLOUDKITTY_OUTPUT_BACKEND=${CLOUDKITTY_OUTPUT_BACKEND:-"cloudkitty.backend.file.FileBackend"}
-CLOUDKITTY_OUTPUT_BASEPATH=${CLOUDKITTY_OUTPUT_BASEPATH:-$CLOUDKITTY_REPORTS_DIR}
-CLOUDKITTY_OUTPUT_PIPELINE=${CLOUDKITTY_OUTPUT_PIPELINE:-"osrf"}
-
-# Set Cloudkitty client info
-GITREPO["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_REPO:-${GIT_BASE}/openstack/python-cloudkittyclient.git}
-GITDIR["python-cloudkittyclient"]=$DEST/python-cloudkittyclient
-GITBRANCH["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_BRANCH:-master}
-
-# Set CloudKitty dashboard info
-GITREPO["cloudkitty-dashboard"]=${CLOUDKITTYDASHBOARD_REPO:-${GIT_BASE}/openstack/cloudkitty-dashboard.git}
-GITDIR["cloudkitty-dashboard"]=$DEST/cloudkitty-dashboard
-GITBRANCH["cloudkitty-dashboard"]=${CLOUDKITTYDASHBOARD_BRANCH:-master}
-
-# Tell Tempest this project is present
-TEMPEST_SERVICES+=,cloudkitty
-
-
 # Functions
 # ---------
 
diff --git a/devstack/settings b/devstack/settings
index 565e4a61..0d90e683 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -1,3 +1,60 @@
 # turn on the CloudKitty services by default
 enable_service ck-api
 enable_service ck-proc
+
+# Defaults
+# Set up default directories
+# --------------------------
+
+CLOUDKITTY_DIR=$DEST/cloudkitty
+CLOUDKITTY_CONF_DIR=/etc/cloudkitty
+CLOUDKITTY_CONF=$CLOUDKITTY_CONF_DIR/cloudkitty.conf
+CLOUDKITTY_API_LOG_DIR=/var/log/cloudkitty
+CLOUDKITTY_AUTH_CACHE_DIR=${CLOUDKITTY_AUTH_CACHE_DIR:-/var/cache/cloudkitty}
+CLOUDKITTY_REPORTS_DIR=${DATA_DIR}/cloudkitty/reports
+
+# Horizon enabled file
+
+CLOUDKITTY_DASHBOARD=$DEST/cloudkitty-dashboard/cloudkittydashboard
+CLOUDKITTY_ENABLED_DIR=${CLOUDKITTY_ENABLED_DIR:-${CLOUDKITTY_DASHBOARD}/enabled}
+CLOUDKITTY_HORIZON_ENABLED_DIR=${CLOUDKITTY_HORIZON_ENABLED_DIR:-$HORIZON_DIR/openstack_dashboard/enabled}
+
+# Set up database backend
+CLOUDKITTY_BACKEND=${CLOUDKITTY_BACKEND:-sqlite}
+
+# Set cloudkitty repository
+CLOUDKITTY_REPO=${CLOUDKITTY_REPO:-${GIT_BASE}/openstack/cloudkitty.git}
+CLOUDKITTY_BRANCH=${CLOUDKITTY_BRANCH:-master}
+
+# Set CloudKitty connection info
+CLOUDKITTY_SERVICE_HOST=${CLOUDKITTY_SERVICE_HOST:-$SERVICE_HOST}
+CLOUDKITTY_SERVICE_PORT=${CLOUDKITTY_SERVICE_PORT:-8888}
+CLOUDKITTY_SERVICE_HOSTPORT="$CLOUDKITTY_SERVICE_HOST:$CLOUDKITTY_SERVICE_PORT"
+CLOUDKITTY_SERVICE_PROTOCOL=${CLOUDKITTY_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
+
+# Set CloudKitty auth info
+CLOUDKITTY_PRICING_USER=${CLOUDKITTY_PRICING_USER:-"admin"}
+CLOUDKITTY_PRICING_PASSWORD=${CLOUDKITTY_PRICING_PASSWORD:-$ADMIN_PASSWORD}
+CLOUDKITTY_PRICING_TENANT=${CLOUDKITTY_PRICING_TENANT:-"demo"}
+
+# Set CloudKitty collect info
+CLOUDKITTY_COLLECTOR=${CLOUDKITTY_COLLECTOR:-ceilometer}
+CLOUDKITTY_SERVICES=${CLOUDKITTY_SERVICES:-compute}
+
+# Set CloudKitty output info
+CLOUDKITTY_OUTPUT_BACKEND=${CLOUDKITTY_OUTPUT_BACKEND:-"cloudkitty.backend.file.FileBackend"}
+CLOUDKITTY_OUTPUT_BASEPATH=${CLOUDKITTY_OUTPUT_BASEPATH:-$CLOUDKITTY_REPORTS_DIR}
+CLOUDKITTY_OUTPUT_PIPELINE=${CLOUDKITTY_OUTPUT_PIPELINE:-"osrf"}
+
+# Set Cloudkitty client info
+GITREPO["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_REPO:-${GIT_BASE}/openstack/python-cloudkittyclient.git}
+GITDIR["python-cloudkittyclient"]=$DEST/python-cloudkittyclient
+GITBRANCH["python-cloudkittyclient"]=${CLOUDKITTYCLIENT_BRANCH:-master}
+
+# Set CloudKitty dashboard info
+GITREPO["cloudkitty-dashboard"]=${CLOUDKITTYDASHBOARD_REPO:-${GIT_BASE}/openstack/cloudkitty-dashboard.git}
+GITDIR["cloudkitty-dashboard"]=$DEST/cloudkitty-dashboard
+GITBRANCH["cloudkitty-dashboard"]=${CLOUDKITTYDASHBOARD_BRANCH:-master}
+
+# Tell Tempest this project is present
+TEMPEST_SERVICES+=,cloudkitty