openstack
/
mistral
Code Issues Proposed changes

Move the default directories into settings file 

Change-Id: I1955541553c37a1687b227cc7d21481e71e10ccb
This commit is contained in:
venkatamahesh 2015-11-15 23:12:52 +05:30
parent ade1d89172
commit aeaf3e8ecf
2 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
devstack/plugin.sh
View File

@ -7,29 +7,6 @@ set -o xtrace
# Defaults
# --------
# Set up default repos
MISTRAL_REPO=${MISTRAL_REPO:-${GIT_BASE}/openstack/mistral.git}
MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-dashboard.git}
MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-$MISTRAL_BRANCH}
MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-$MISTRAL_BRANCH}
MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
# Set up default directories
MISTRAL_DIR=$DEST/mistral
MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard
MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf
MISTRAL_DEBUG=${MISTRAL_DEBUG:-True}
MISTRAL_SERVICE_HOST=${MISTRAL_SERVICE_HOST:-$SERVICE_HOST}
MISTRAL_SERVICE_PORT=${MISTRAL_SERVICE_PORT:-8989}
MISTRAL_SERVICE_PROTOCOL=${MISTRAL_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
MISTRAL_ADMIN_USER=${MISTRAL_ADMIN_USER:-mistral}
# Support entry points installation of console scripts
if [[ -d $MISTRAL_DIR/bin ]]; then
MISTRAL_BIN_DIR=$MISTRAL_DIR/bin

25
devstack/settings
View File

@ -3,3 +3,28 @@
# We have to add Mistral to enabled services for screen_it to work
enable_service mistral
# Set up default repos
MISTRAL_REPO=${MISTRAL_REPO:-${GIT_BASE}/openstack/mistral.git}
MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-dashboard.git}
MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-$MISTRAL_BRANCH}
MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-$MISTRAL_BRANCH}
MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
# Set up default directories
MISTRAL_DIR=$DEST/mistral
MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard
MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf
MISTRAL_DEBUG=${MISTRAL_DEBUG:-True}
MISTRAL_SERVICE_HOST=${MISTRAL_SERVICE_HOST:-$SERVICE_HOST}
MISTRAL_SERVICE_PORT=${MISTRAL_SERVICE_PORT:-8989}
MISTRAL_SERVICE_PROTOCOL=${MISTRAL_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
MISTRAL_ADMIN_USER=${MISTRAL_ADMIN_USER:-mistral}