openstack/mistral
Code Issues Proposed changes

When installing devstack enable the bash completion

Browse Source 
In devstack if we install the client then copy the bash
completion script to its folder.
also use the standart devstack function to install the
mistral client

Change-Id: I69ca615ed446214463f8fa7a3e303ff0bf32b460
This commit is contained in:
Eyal 2019-07-21 08:38:33 +03:00
parent 258575c21d
commit 90a9a48f21
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/plugin.sh
View File

@ -139,12 +139,9 @@ function _install_mistraldashboard {
function install_mistral_pythonclient { function install_mistral_pythonclient {
if use_library_from_git "python-mistralclient"; then if use_library_from_git "python-mistralclient"; then
git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH git_clone_by_name "python-mistralclient"
local tags=`git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -l | grep 2015` setup_dev_lib "python-mistralclient"
if [ ! "$tags" = "" ]; then sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-mistralclient"]}/tools/,/etc/bash_completion.d/}mistral.bash_completion
git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags
fi
setup_develop $MISTRAL_PYTHONCLIENT_DIR
fi fi
} }

14
devstack/settings
View File

@ -19,17 +19,17 @@ MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-dashboard.git} MISTRAL_DASHBOARD_REPO=${MISTRAL_DASHBOARD_REPO:-${GIT_BASE}/openstack/mistral-dashboard.git}
MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-master} MISTRAL_DASHBOARD_BRANCH=${MISTRAL_DASHBOARD_BRANCH:-master}
MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-master}
MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
MISTRAL_LIB_REPO=${MISTRAL_LIB_REPO:-${GIT_BASE}/openstack/mistral-lib.git} MISTRAL_LIB_REPO=${MISTRAL_LIB_REPO:-${GIT_BASE}/openstack/mistral-lib.git}
MISTRAL_LIB_BRANCH=${MISTRAL_LIB_BRANCH:-master} MISTRAL_LIB_BRANCH=${MISTRAL_LIB_BRANCH:-master}
MISTRAL_LIB_DIR=$DEST/mistral-lib MISTRAL_LIB_DIR=${DEST}/mistral-lib
GITDIR["python-mistralclient"]=${DEST}/python-mistralclient
GITREPO["python-mistralclient"]=${MISTRALCLIENT_REPO:-${GIT_BASE}/openstack/python-mistralclient.git}
GITBRANCH["python-mistralclient"]=${MISTRALCLIENT_BRANCH:-master}
# Set up default directories # Set up default directories
MISTRAL_DIR=$DEST/mistral MISTRAL_DIR=${DEST}/mistral
MISTRAL_DASHBOARD_DIR=$DEST/mistral-dashboard MISTRAL_DASHBOARD_DIR=${DEST}/mistral-dashboard
MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral} MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf MISTRAL_CONF_FILE=${MISTRAL_CONF_DIR}/mistral.conf
MISTRAL_DEBUG=${MISTRAL_DEBUG:-True} MISTRAL_DEBUG=${MISTRAL_DEBUG:-True}