From 3984c1ba4640a719ce9ad207f383f43b7861c9db Mon Sep 17 00:00:00 2001 From: Victor Ryzhenkin Date: Wed, 28 Oct 2015 04:08:43 +0300 Subject: [PATCH] Move variables from plugin.sh to settings Global variables are the same as settings and should be in plugin settings file. This patch moves variables from plugin.sh to settings file. Also add a few comments for variables groups for better understanding for what specific variable is responsible. Change-Id: I47aef3b047ce11a5729643353e801eee963e4e76 Closes-Bug: #1510744 --- devstack/plugin.sh | 50 ----------------------------------------- devstack/settings | 56 +++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 51 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index f7a336e26..a0fec3581 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -11,56 +11,6 @@ XTRACE=$(set +o | grep xtrace) set -o xtrace -# Defaults -# -------- - -# Set up default repos -MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git} -MURANO_BRANCH=${MURANO_BRANCH:-master} - -# 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 -MURANO_CONF_DIR=${MURANO_CONF_DIR:-/etc/murano} -MURANO_CONF_FILE=${MURANO_CONF_DIR}/murano.conf -MURANO_POLICY_FILE=${MURANO_CONF_DIR}/policy.json -MURANO_DEBUG=${MURANO_DEBUG:-True} -MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=${MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT:-False} - -MURANO_SERVICE_HOST=${MURANO_SERVICE_HOST:-$SERVICE_HOST} -MURANO_SERVICE_PORT=${MURANO_SERVICE_PORT:-8082} -MURANO_SERVICE_PROTOCOL=${MURANO_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} - -MURANO_CFAPI_SERVICE_PORT=${MURANO_CFAPI_SERVICE_PORT:-8083} -MURANO_CFAPI_DEFAULT_TENANT=${MURANO_CFAPI_DEFAULT_TENANT:-admin} - -MURANO_ADMIN_USER=${MURANO_ADMIN_USER:-murano} - -MURANO_KEYSTONE_SIGNING_DIR=${MURANO_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing-muranoapi} - -MURANO_DEFAULT_ROUTER=${MURANO_DEFAULT_ROUTER:-''} -MURANO_EXTERNAL_NETWORK=${MURANO_EXTERNAL_NETWORK:-''} -MURANO_DEFAULT_DNS=${MURANO_DEFAULT_DNS:-''} - -MURANO_APPS=${MURANO_APPS:-''} -MURANO_APPS_DIR=$DEST/murano-apps -MURANO_APPS_REPO=${MURANO_APPS_REPO:-${GIT_BASE}/openstack/murano-apps.git} -MURANO_APPS_BRANCH=${MURANO_APPS_BRANCH:-master} - -# MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services. -# This is not required if all OpenStack services are deployed by devstack scripts -# on a single node. In this case '/' virtual host (which is the default) is enough. -# The problem arise when Murano installed in 'devbox' mode, allowing two or more -# devboxes to use one common OpenStack host. In this case it's better devboxes -# use separated virtual hosts, to avoid conflicts between Murano services. -# This couldn't be done using exitsting variables, so that's why this variable was added. -MURANO_RABBIT_VHOST=${MURANO_RABBIT_VHOST:-''} - # Support entry points installation of console scripts if [[ -d $MURANO_DIR/bin ]]; then MURANO_BIN_DIR=$MURANO_DIR/bin diff --git a/devstack/settings b/devstack/settings index 14cf66f17..3662dd2d3 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,4 +1,58 @@ -# Devstack settings +# Settings needed for the Murano plugin +# ------------------------------------- + +# Set up default repos +MURANO_REPO=${MURANO_REPO:-${GIT_BASE}/openstack/murano.git} +MURANO_BRANCH=${MURANO_BRANCH:-master} + +# 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 +MURANO_CONF_DIR=${MURANO_CONF_DIR:-/etc/murano} +MURANO_CONF_FILE=${MURANO_CONF_DIR}/murano.conf +MURANO_POLICY_FILE=${MURANO_CONF_DIR}/policy.json +MURANO_DEBUG=${MURANO_DEBUG:-True} +MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT=${MURANO_ENABLE_MODEL_POLICY_ENFORCEMENT:-False} + +# Set up murano service endpoint +MURANO_SERVICE_HOST=${MURANO_SERVICE_HOST:-$SERVICE_HOST} +MURANO_SERVICE_PORT=${MURANO_SERVICE_PORT:-8082} +MURANO_SERVICE_PROTOCOL=${MURANO_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL} + +# Set up settings for service broker API +MURANO_CFAPI_SERVICE_PORT=${MURANO_CFAPI_SERVICE_PORT:-8083} +MURANO_CFAPI_DEFAULT_TENANT=${MURANO_CFAPI_DEFAULT_TENANT:-admin} + +# Set up default service user for murano +MURANO_ADMIN_USER=${MURANO_ADMIN_USER:-murano} + +MURANO_KEYSTONE_SIGNING_DIR=${MURANO_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing-muranoapi} + +# Set up murano networking settings +MURANO_DEFAULT_ROUTER=${MURANO_DEFAULT_ROUTER:-''} +MURANO_EXTERNAL_NETWORK=${MURANO_EXTERNAL_NETWORK:-''} +MURANO_DEFAULT_DNS=${MURANO_DEFAULT_DNS:-''} + +# Choose applications for installation +MURANO_APPS=${MURANO_APPS:-''} +MURANO_APPS_DIR=$DEST/murano-apps +MURANO_APPS_REPO=${MURANO_APPS_REPO:-${GIT_BASE}/openstack/murano-apps.git} +MURANO_APPS_BRANCH=${MURANO_APPS_BRANCH:-master} + +# MURANO_RABBIT_VHOST allows to specify a separate virtual host for Murano services. +# This is not required if all OpenStack services are deployed by devstack scripts +# on a single node. In this case '/' virtual host (which is the default) is enough. +# The problem arise when Murano installed in 'devbox' mode, allowing two or more +# devboxes to use one common OpenStack host. In this case it's better devboxes +# use separated virtual hosts, to avoid conflicts between Murano services. +# This couldn't be done using exitsting variables, so that's why this variable was added. +MURANO_RABBIT_VHOST=${MURANO_RABBIT_VHOST:-''} + enable_service murano enable_service murano-api