openstack/deb-mistral
Code Issues Proposed changes

Add installation of mistralclient in devstack script

Browse Source 
To run tests for pythonclient need to have installed client.

Change-Id: Ic626139ce388dbe9f43a1a9644e72c07ff1f51aa
This commit is contained in:
Anastasia Kuznetsova 2014-07-08 14:47:22 +04:00
parent 4dcd1d76c8
commit f4ea6a2710
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/devstack/lib/mistral
View File

@ -24,6 +24,10 @@ set -o xtrace
MISTRAL_REPO=${MISTRAL_REPO:-${GIT_BASE}/stackforge/mistral.git} MISTRAL_REPO=${MISTRAL_REPO:-${GIT_BASE}/stackforge/mistral.git}
MISTRAL_BRANCH=${MISTRAL_BRANCH:-master} MISTRAL_BRANCH=${MISTRAL_BRANCH:-master}
MISTRAL_PYTHONCLIENT_REPO=${MISTRAL_PYTHONCLIENT_REPO:-${GIT_BASE}/stackforge/python-mistralclient.git}
MISTRAL_PYTHONCLIENT_BRANCH=${MISTRAL_PYTHONCLIENT_BRANCH:-$MISTRAL_BRANCH}
MISTRAL_PYTHONCLIENT_DIR=$DEST/python-mistralclient
# Set up default directories # Set up default directories
MISTRAL_DIR=$DEST/mistral MISTRAL_DIR=$DEST/mistral
MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral} MISTRAL_CONF_DIR=${MISTRAL_CONF_DIR:-/etc/mistral}
@ -137,6 +141,8 @@ function init_mistral() {
# install_mistral() - Collect source and prepare # install_mistral() - Collect source and prepare
function install_mistral() { function install_mistral() {
install_mistral_pythonclient
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_package function is used because Mistral requirements
@ -146,6 +152,11 @@ function install_mistral() {
setup_package $MISTRAL_DIR -e setup_package $MISTRAL_DIR -e
} }
function install_mistral_pythonclient() {
git_clone $MISTRAL_PYTHONCLIENT_REPO $MISTRAL_PYTHONCLIENT_DIR $MISTRAL_PYTHONCLIENT_BRANCH
setup_package $MISTRAL_PYTHONCLIENT_DIR -e
}
# start_mistral() - Start running processes, including screen # start_mistral() - Start running processes, including screen
function start_mistral() { function start_mistral() {

2
functionaltests/pre_test_hook.sh
View File

@ -14,7 +14,7 @@
# This script is executed inside pre_test_hook function in desvstack gate. # This script is executed inside pre_test_hook function in desvstack gate.
# Install Murano devstack integration # Install Mistral devstack integration
MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack MISTRAL_BASE=/opt/stack/new/mistral/contrib/devstack
DEVSTACK_BASE=/opt/stack/new/devstack DEVSTACK_BASE=/opt/stack/new/devstack
cp $MISTRAL_BASE/lib/* $DEVSTACK_BASE/lib cp $MISTRAL_BASE/lib/* $DEVSTACK_BASE/lib