diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-25 01:00:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-25 01:00:16 +0000 |
| commit | e1fad430d4f4067c0fa788b2684e75125cf5fd3e (patch) | |
| tree | 0f8ad88b08591facc6689409d05f3a8a5f866aa9 | |
| parent | e9b81be6001b0437ed37bc962cb1c6bc3ff9708a (diff) | |
| parent | 426ce72e1de05e87c59725c271f222ec74f4f50f (diff) | |
| download | trove-integration-e1fad430d4f4067c0fa788b2684e75125cf5fd3e.tar.gz | |
Merge "Have Trove plugin install dashboard"
| -rw-r--r-- | scripts/localrc.rc | 1 | ||||
| -rw-r--r-- | scripts/redstack.rc | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/localrc.rc b/scripts/localrc.rc index 0acfd99..ef45ba4 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 bfd49ef..2c694ea 100644 --- a/scripts/redstack.rc +++ b/scripts/redstack.rc @@ -50,6 +50,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 @@ -62,11 +63,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 |