openstack/deb-murano
Code Issues Proposed changes

Merge "Install python client from repo"

Browse Source
This commit is contained in:
Jenkins
2014-06-11 17:48:28 +00:00
committed by Gerrit Code Review
parent fe6dec9da7 79ffe1ec93
commit 4f66452a1e
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/devstack/lib/murano
View File

@@ -24,6 +24,10 @@ set -o xtrace
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/stackforge/murano.git}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/stackforge/python-muranoclient.git}
MURANO_PYTHONCLIENT_BRANCH=${MURANO_PYTHONCLIENT_BRANCH:-$MURANO_BRANCH}
MURANO_PYTHONCLIENT_DIR=$DEST/python-muranoclient
# Set up default directories
MURANO_DIR=$DEST/murano
MURANO_CONF_DIR=${MURANO_CONF_DIR:-/etc/murano}
@@ -172,6 +176,8 @@ function init_murano() {
# install_murano() - Collect source and prepare
function install_murano() {
install_murano_pythonclient
git_clone $MURANO_REPO $MURANO_DIR $MURANO_BRANCH
# TODO(ruhe): use setup_develop once Murano requirements match with global-requirement.txt
@@ -181,6 +187,12 @@ function install_murano() {
}
function install_murano_pythonclient() {
git_clone $MURANO_PYTHONCLIENT_REPO $MURANO_PYTHONCLIENT_DIR $MURANO_PYTHONCLIENT_BRANCH
setup_package $MURANO_PYTHONCLIENT_DIR -e
}
# start_murano() - Start running processes, including screen
function start_murano() {
screen_it murano-api "cd $MURANO_DIR && $MURANO_BIN_DIR/murano-api --config-file $MURANO_CONF_DIR/murano.conf"

12
contrib/devstack/lib/murano-dashboard
View File

@@ -31,10 +31,6 @@ MURANO_DASHBOARD_REPO=${MURANO_DASHBOARD_REPO:-${GIT_BASE}/stackforge/murano-das
MURANO_DASHBOARD_BRANCH=${MURANO_DASHBOARD_BRANCH:-$MURANO_BRANCH}
MURANO_DASHBOARD_DIR=$DEST/murano-dashboard
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/stackforge/python-muranoclient.git}
MURANO_PYTHONCLIENT_BRANCH=${MURANO_PYTHONCLIENT_BRANCH:-$MURANO_BRANCH}
MURANO_PYTHONCLIENT_DIR=$DEST/murano-pythonclient
# Set up default directories
MURANO_DASHBOARD_DIR=$DEST/murano-dashboard
MURANO_PYTHONCLIENT_DIR=$DEST/python-muranoclient
@@ -137,8 +133,6 @@ function init_murano_dashboard() {
function install_murano_dashboard() {
echo_summary "Install Murano Dashboard"
install_murano_pythonclient
git_clone $MURANO_DASHBOARD_REPO $MURANO_DASHBOARD_DIR $MURANO_DASHBOARD_BRANCH
# TODO(dteselkin): use setup_develop once Murano requirements match with global-requirement.txt
# both functions (setup_develop and setup_package) are defined at:
@@ -147,12 +141,6 @@ function install_murano_dashboard() {
}
function install_murano_pythonclient() {
git_clone $MURANO_PYTHONCLIENT_REPO $MURANO_PYTHONCLIENT_DIR $MURANO_PYTHONCLIENT_BRANCH
setup_develop $MURANO_PYTHONCLIENT_DIR
}
# cleanup_murano_dashboard() - Remove residual data files, anything left over from previous
# runs that a clean run would need to clean up
function cleanup_murano_dashboard() {