openstack/deb-murano
Code Issues Proposed changes

Add rabbitmq section config

Browse Source 
Configuration of [rabbitmq] section was missed in devstack scripts.
This lead to wrong parameters passed into instance config.

Change-Id: Ia5b35ba564f76b85ec2fe78afc7c5996b33e7f88
Closes-bug: 1321723
This commit is contained in:
Dmitry Teselkin 2014-05-21 16:42:28 +04:00
parent f0f6e208ea
commit 289c35fa5b
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
contrib/devstack/lib/murano
View File

@ -101,6 +101,25 @@ function mkdir_chown_stack {
sudo chown $STACK_USER "$1" sudo chown $STACK_USER "$1"
} }
function configure_murano_rpc_backend() {
# Configure the rpc service.
iniset_rpc_backend muranoapi $MURANO_CONF_FILE DEFAULT
# TODO(ruhe): get rid of this ugly workaround.
inicomment $MURANO_CONF_FILE DEFAULT rpc_backend
iniset $MURANO_CONF_FILE rabbitmq host $RABBIT_HOST
iniset $MURANO_CONF_FILE rabbitmq password $RABBIT_PASSWORD
# Set non-default rabbit virtual host if required.
if [[ -n "$MURANO_RABBIT_VHOST" ]]; then
iniset $MURANO_CONF_FILE DEFAULT rabbit_virtual_host $MURANO_RABBIT_VHOST
iniset $MURANO_CONF_FILE rabbitmq virtual_host $MURANO_RABBIT_VHOST
fi
}
# Entry points # Entry points
# ------------ # ------------
@ -128,16 +147,7 @@ function configure_murano {
iniset $MURANO_CONF_FILE keystone_authtoken admin_user $MURANO_ADMIN_USER iniset $MURANO_CONF_FILE keystone_authtoken admin_user $MURANO_ADMIN_USER
iniset $MURANO_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD iniset $MURANO_CONF_FILE keystone_authtoken admin_password $SERVICE_PASSWORD
# configure the rpc service. configure_murano_rpc_backend
iniset_rpc_backend muranoapi $MURANO_CONF_FILE DEFAULT
# TODO(ruhe): get rid of this ugly workaround
inicomment $MURANO_CONF_FILE DEFAULT rpc_backend
# Set non-default rabbit virtual host if required
if [[ -n "$MURANO_RABBIT_VHOST" ]]; then
iniset $MURANO_CONF_FILE DEFAULT rabbit_virtual_host $MURANO_RABBIT_VHOST
fi
# Configure notifications for status information during provisioning # Configure notifications for status information during provisioning
iniset $MURANO_CONF_FILE DEFAULT notification_driver messagingv2 iniset $MURANO_CONF_FILE DEFAULT notification_driver messagingv2