openstack/mistral
Code Issues Proposed changes

Use setup_develop instead of setup_package in plugin.sh

Browse Source 
Since all mistral requirements are match with global requirements
it is more correct to use setup_develop function.
Info about this function and difference with setup_package
function can be found here:
https://github.com/openstack-dev/devstack/blob/master/inc/python

Change-Id: I8b283df8734675f92d9bc8266bafe7cece6fb5f9
This commit is contained in:
Anastasia Kuznetsova 2015-11-20 17:51:19 +03:00
parent c11ef5c435
commit 869faeb771
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
devstack/plugin.sh
View File

@ -102,11 +102,7 @@ function install_mistral {
git_clone $MISTRAL_REPO $MISTRAL_DIR $MISTRAL_BRANCH git_clone $MISTRAL_REPO $MISTRAL_DIR $MISTRAL_BRANCH
# setup_package function is used because Mistral requirements setup_develop $MISTRAL_DIR -e
# don't match with global-requirement.txt
# both functions (setup_develop and setup_package) are defined at:
# http://git.openstack.org/cgit/openstack-dev/devstack/tree/functions-common
setup_package $MISTRAL_DIR -e
# installing python-nose. # installing python-nose.
real_install_package python-nose real_install_package python-nose
@ -119,7 +115,7 @@ function install_mistral {
function _install_mistraldashboard { function _install_mistraldashboard {
git_clone $MISTRAL_DASHBOARD_REPO $MISTRAL_DASHBOARD_DIR $MISTRAL_DASHBOARD_BRANCH git_clone $MISTRAL_DASHBOARD_REPO $MISTRAL_DASHBOARD_DIR $MISTRAL_DASHBOARD_BRANCH
setup_package $MISTRAL_DASHBOARD_DIR -e setup_develop $MISTRAL_DASHBOARD_DIR -e
ln -fs $MISTRAL_DASHBOARD_DIR/_50_mistral.py.example $HORIZON_DIR/openstack_dashboard/local/enabled/_50_mistral.py ln -fs $MISTRAL_DASHBOARD_DIR/_50_mistral.py.example $HORIZON_DIR/openstack_dashboard/local/enabled/_50_mistral.py
} }
@ -130,7 +126,7 @@ function install_mistral_pythonclient {
if [ ! "$tags" = "" ]; then if [ ! "$tags" = "" ]; then
git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags git --git-dir=$MISTRAL_PYTHONCLIENT_DIR/.git tag -d $tags
fi fi
setup_package $MISTRAL_PYTHONCLIENT_DIR -e setup_develop $MISTRAL_PYTHONCLIENT_DIR -e
} }