openstack
/
murano
Code Issues Proposed changes

Use setup_develop in devstack libs and plugin for devstack 

- Replace setup_package function with setup_develop in plugin
and libs for devstack
- Revome enabling service murano-dashboard in plugin because of
murano-dashboard will be enabled by default if horizon service
is enabled.

Change-Id: I6716ca32b6022b5ffdc9dd2acfcc73e00340bc2b
Partially-Implements: blueprint enable-openstack-proposal-bot
This commit is contained in:
Victor Ryzhenkin 2015-07-10 16:29:21 +03:00
parent e7f989b534
commit 51c00f3fcb
5 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/devstack/extras.d/70-murano.sh
View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
# murano.sh - DevStack extras script to install Murano
if is_service_enabled murano; then

21
contrib/devstack/lib/murano
View File

@ -24,9 +24,9 @@ set -o xtrace
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
MURANO_PYTHONCLIENT_BRANCH=${MURANO_PYTHONCLIENT_BRANCH:-master}
MURANO_PYTHONCLIENT_DIR=$DEST/python-muranoclient
GITREPO["python-muranoclient"]=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-master}
GITDIR["python-muranoclient"]=$DEST/python-muranoclient
# Set up default directories
MURANO_DIR=$DEST/murano
@ -231,16 +231,19 @@ function install_murano() {
git_clone $MURANO_REPO $MURANO_DIR $MURANO_BRANCH
# TODO(ruhe): use setup_develop once Murano requirements 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 $MURANO_DIR -e
setup_develop $MURANO_DIR
}
function install_murano_pythonclient() {
git_clone $MURANO_PYTHONCLIENT_REPO $MURANO_PYTHONCLIENT_DIR $MURANO_PYTHONCLIENT_BRANCH
setup_package $MURANO_PYTHONCLIENT_DIR -e
# For using non-released client from git branch, need to add
# LIBS_FROM_GIT=python-muranoclient parameter to localrc.
# Otherwise, murano will install python-muranoclient from requirements.
if use_library_from_git "python-muranoclient"; then
git_clone_by_name "python-muranoclient"
setup_dev_lib "python-muranoclient"
sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-muranoclient"]}/tools/,/etc/bash_completion.d/}murano.bash_completion
fi
}

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

@ -137,10 +137,8 @@ function install_murano_dashboard() {
echo_summary "Install Murano Dashboard"
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:
# http://git.openstack.org/cgit/openstack-dev/devstack/tree/functions-common
setup_package $MURANO_DASHBOARD_DIR -e
setup_develop $MURANO_DASHBOARD_DIR
}

31
devstack/plugin.sh
View File

@ -1,3 +1,4 @@
#!/usr/bin/env bash
# Plugin file for Murano services
# -------------------------------
@ -17,9 +18,11 @@ set -o xtrace
MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git}
MURANO_BRANCH=${MURANO_BRANCH:-master}
MURANO_PYTHONCLIENT_REPO=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
MURANO_PYTHONCLIENT_BRANCH=${MURANO_PYTHONCLIENT_BRANCH:-master}
MURANO_PYTHONCLIENT_DIR=$DEST/python-muranoclient
# Variables, which used in this function
# https://github.com/openstack-dev/devstack/blob/master/functions-common#L500-L506
GITREPO["python-muranoclient"]=${MURANO_PYTHONCLIENT_REPO:-${GIT_BASE}/openstack/python-muranoclient.git}
GITBRANCH["python-muranoclient"]=${MURANO_PYTHONCLIENT_BRANCH:-master}
GITDIR["python-muranoclient"]=$DEST/python-muranoclient
# Set up default directories
MURANO_DIR=$DEST/murano
@ -224,16 +227,20 @@ function install_murano() {
git_clone $MURANO_REPO $MURANO_DIR $MURANO_BRANCH
# TODO(ruhe): use setup_develop once Murano requirements 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 $MURANO_DIR -e
setup_develop $MURANO_DIR
}
function install_murano_pythonclient() {
git_clone $MURANO_PYTHONCLIENT_REPO $MURANO_PYTHONCLIENT_DIR $MURANO_PYTHONCLIENT_BRANCH
setup_package $MURANO_PYTHONCLIENT_DIR -e
# For using non-released client from git branch, need to add
# LIBS_FROM_GIT=python-muranoclient parameter to localrc.
# Otherwise, murano will install python-muranoclient from requirements.
if use_library_from_git "python-muranoclient"; then
git_clone_by_name "python-muranoclient"
setup_dev_lib "python-muranoclient"
# Installing bash_completion for murano
sudo install -D -m 0644 -o $STACK_USER {${GITDIR["python-muranoclient"]}/tools/,/etc/bash_completion.d/}murano.bash_completion
fi
}
@ -390,10 +397,8 @@ function install_murano_dashboard() {
echo_summary "Install Murano Dashboard"
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:
# http://git.openstack.org/cgit/openstack-dev/devstack/tree/functions-common
setup_package $MURANO_DASHBOARD_DIR -e
setup_develop $MURANO_DASHBOARD_DIR
}

1
devstack/settings
View File

@ -3,4 +3,3 @@
enable_service murano
enable_service murano-api
enable_service murano-engine
enable_service muarno-dashboard