Merge "Have Trove plugin install dashboard"
This commit is contained in:
commit
e1fad430d4
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue