openstack
/
murano-deployment
Code Issues Proposed changes

Atlernative address for RabbitMQ added. 

This address will be used inside instance, if specified.

Change-Id: Idd0792f04a192ef985a70edf4fcce23e7b4a9767
This commit is contained in:
Dmitry Teselkin 2013-09-17 15:20:11 +04:00
parent f953d9d803
commit 337a09ee8f
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devbox-scripts/murano-git-install.sh
View File

@ -316,13 +316,6 @@ function uninstall_murano_apps {
function configure_murano {
log "** Configuring Murano ..."
# Try to assign to the local variable value of RABBITMQ_HOST
# If it's undefined or empty - use LAB_HOST instead.
# The RABBITMQ_HOST couldn't be defined that way because it
# holds an address of a RabbitMQ host ONLY when this host
# differs from one where Murano runs.
local rabbitmq_host=${RABBITMQ_HOST:-$LAB_HOST}
for config_file in $murano_config_files ; do
log "** Configuring file '$config_file'"
@ -333,7 +326,7 @@ function configure_murano {
case "$config_file" in
'/etc/murano-api/murano-api.conf')
iniset 'DEFAULT' 'log_file' '/var/log/murano-api.log' "$config_file"
iniset 'rabbitmq' 'host' "$rabbitmq_host" "$config_file"
iniset 'rabbitmq' 'host' "$RABBITMQ_HOST" "$config_file"
iniset 'rabbitmq' 'login' "$RABBITMQ_LOGIN" "$config_file"
iniset 'rabbitmq' 'password' "$RABBITMQ_PASSWORD" "$config_file"
iniset 'rabbitmq' 'virtual_host' "$RABBITMQ_VHOST" "$config_file"
@ -348,7 +341,7 @@ function configure_murano {
'/etc/murano-conductor/conductor.conf')
iniset 'DEFAULT' 'log_file' '/var/log/murano-conductor.log' "$config_file"
iniset 'keystone' 'auth_url' "$AUTH_URL" "$config_file"
iniset 'rabbitmq' 'host' "$rabbitmq_host" "$config_file"
iniset 'rabbitmq' 'host' "$RABBITMQ_HOST" "$config_file"
iniset 'rabbitmq' 'login' "$RABBITMQ_LOGIN" "$config_file"
iniset 'rabbitmq' 'password' "$RABBITMQ_PASSWORD" "$config_file"
iniset 'rabbitmq' 'virtual_host' "$RABBITMQ_VHOST" "$config_file"
@ -365,8 +358,8 @@ function configure_murano {
replace '%MURANO_SERVER_ADDRESS%' "$FILE_SHARE_HOST" "$config_file"
;;
'/etc/murano-conductor/data/templates/agent-config/Default.template')
[ -n "$RABBITMQ_HOST" ] && \
replace '%RABBITMQ_HOST%' "$RABBITMQ_HOST" "$config_file"
[ -n "$RABBITMQ_HOST_ALT" ] && \
replace '%RABBITMQ_HOST%' "$RABBITMQ_HOST_ALT" "$config_file"
;;
esac
@ -519,8 +512,8 @@ RABBITMQ_LOGIN=''
RABBITMQ_PASSWORD=''
RABBITMQ_VHOST=''
#RABBITMQ_NODE_LIST=''
#RABBITMQ_HOST=''
#RABBITMQ_HOST_ALT=''
#FILE_SHARE_HOST=''
@ -546,7 +539,7 @@ fi
AUTH_URL="$AUTH_PROTO://$LAB_HOST:5000/v2.0"
RABBITMQ_HOST=${RABBITMQ_HOST:-$(echo $RABBITMQ_NODE_LIST | cut -d ' ' -f 1)}
RABBITMQ_HOST=${RABBITMQ_HOST:-$LAB_HOST}
EOF