summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDale Smith <dale@catalyst-eu.net>2016-01-28 13:50:00 +0000
committerDale Smith <dale@catalyst-eu.net>2016-01-28 14:07:58 +0000
commit63a9e92c46e5b70e00a722b942540841a824d257 (patch)
treebd7b8dddbc9b56800ffd549e9d429cc590da40fa
parent3947535579bc112e43a2c17b44a81c74ffaf1f4c (diff)
downloadtrove-integration-63a9e92c46e5b70e00a722b942540841a824d257.tar.gz
Enabling trove-dashboard plugin when trove is enabled.
The Horizon dashboard for trove has been converted to a plugin and is now required to be installed in devstack with enable_plugin. Change-Id: If821536593590d2dd81214d40c26be74eb3e78e2
-rw-r--r--scripts/localrc.rc1
-rw-r--r--scripts/redstack.rc2
2 files changed, 3 insertions, 0 deletions
diff --git a/scripts/localrc.rc b/scripts/localrc.rc
index 30ee636..97c16a0 100644
--- a/scripts/localrc.rc
+++ b/scripts/localrc.rc
@@ -12,6 +12,7 @@ TROVE_AUTH_CACHE_DIR=$TROVE_AUTH_CACHE_DIR
# Enable the Trove plugin for devstack
if [[ $USE_DEVSTACK_TROVE_PLUGIN = true ]]; then
enable_plugin trove $TROVE_REPO $TROVE_BRANCH
+ enable_plugin trove-dashboard $TROVEDASHBOARD_REPO $TROVEDASHBOARD_BRANCH
fi
# Enable Trove, Swift, and Heat
diff --git a/scripts/redstack.rc b/scripts/redstack.rc
index 2fbf12f..4d5c024 100644
--- a/scripts/redstack.rc
+++ b/scripts/redstack.rc
@@ -57,6 +57,8 @@ TROVE_BRANCH=${TROVE_BRANCH:-master}
TROVECLIENT_REPO=${TROVECLIENT_REPO:-${GIT_OPENSTACK}/python-troveclient.git}
TROVECLIENT_DIR=${TROVECLIENT_DIR:-${PATH_PYTHON_TROVECLIENT}}
TROVECLIENT_BRANCH=${TROVECLIENT_BRANCH:-master}
+TROVEDASHBOARD_REPO=${TROVEDASHBOARD_REPO:-${GIT_OPENSTACK}/trove-dashboard.git}
+TROVEDASHBOARD_BRANCH=${TROVEDASHBOARD_BRANCH:-master}
# Destination for working data
DATA_DIR=${DEST}/data