From 426ce72e1de05e87c59725c271f222ec74f4f50f Mon Sep 17 00:00:00 2001 From: Peter Stachowski Date: Fri, 17 Jun 2016 13:54:46 -0400 Subject: [PATCH] Have Trove plugin install dashboard This fixes redstack since the Trove plugin now handles installing the dashboard if Horizon is enabled. Variables were changed to reflect current names. Change-Id: I18f68136ebb81bc4b4f8c12062d084a5d8901193 Depends-On: I6586801bff4282e3bbf11e45e4f171fffcab285e Closes-Bug: 1593806 --- scripts/localrc.rc | 1 - scripts/redstack.rc | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/localrc.rc b/scripts/localrc.rc index d6baa263..d75126dc 100644 --- a/scripts/localrc.rc +++ b/scripts/localrc.rc @@ -12,7 +12,6 @@ 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 62e500f0..e40f9932 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -47,6 +47,7 @@ PATH_KEYSTONECLIENT=$DEST/python-keystoneclient PATH_OPENSTACKCLIENT=$DEST/python-openstackclient PATH_PYTHON_SWIFTCLIENT=$DEST/python-swiftclient PATH_PYTHON_TROVECLIENT=$DEST/python-troveclient +PATH_TROVE_DASHBOARD=$DEST/trove-dashboard PATH_DISKIMAGEBUILDER=$DEST/diskimage-builder PATH_TRIPLEO_ELEMENTS=$DEST/tripleo-image-elements @@ -59,11 +60,12 @@ DEVSTACK_REPO=${DEVSTACK_REPO:-${GIT_BASE}/openstack-dev/devstack.git} TROVE_REPO=${TROVE_REPO:-${GIT_OPENSTACK}/trove.git} TROVE_DIR=${TROVE_DIR:-${PATH_TROVE}} 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} +TROVE_CLIENT_REPO=${TROVE_CLIENT_REPO:-${TROVECLIENT_REPO:-${GIT_OPENSTACK}/python-troveclient.git}} +TROVE_CLIENT_DIR=${TROVE_CLIENT_DIR:-${TROVECLIENT_DIR:-${PATH_PYTHON_TROVECLIENT}}} +TROVE_CLIENT_BRANCH=${TROVE_CLIENT_BRANCH:-${TROVECLIENT_BRANCH:-master}} +TROVE_DASHBOARD_REPO=${TROVE_DASHBOARD_REPO:-${TROVEDASHBOARD_REPO:-${GIT_OPENSTACK}/trove-dashboard.git}} +TROVE_DASHBOARD_DIR=${TROVE_DASHBOARD_DIR:-${TROVEDASHBOARD_DIR:-${PATH_TROVE_DASHBOARD}}} +TROVE_DASHBOARD_BRANCH=${TROVE_DASHBOARD_BRANCH:-${TROVEDASHBOARD_BRANCH:-master}} # Destination for working data DATA_DIR=${DEST}/data