openstack/devstack
Code Issues Proposed changes

Merge "Use transport_url instead of driver-specif options"

Browse Source
This commit is contained in:
Jenkins 2016-06-09 14:36:23 +00:00 committed by Gerrit Code Review
commit 08c5db307e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/nova
View File

@ -631,7 +631,7 @@ function init_nova_cells {
if is_service_enabled n-cell; then if is_service_enabled n-cell; then
cp $NOVA_CONF $NOVA_CELLS_CONF cp $NOVA_CONF $NOVA_CELLS_CONF
iniset $NOVA_CELLS_CONF database connection `database_connection_url $NOVA_CELLS_DB` iniset $NOVA_CELLS_CONF database connection `database_connection_url $NOVA_CELLS_DB`
iniset $NOVA_CELLS_CONF oslo_messaging_rabbit rabbit_virtual_host child_cell iniset_rpc_backend nova $NOVA_CELLS_CONF DEFAULT child_cell
iniset $NOVA_CELLS_CONF DEFAULT dhcpbridge_flagfile $NOVA_CELLS_CONF iniset $NOVA_CELLS_CONF DEFAULT dhcpbridge_flagfile $NOVA_CELLS_CONF
iniset $NOVA_CELLS_CONF cells enable True iniset $NOVA_CELLS_CONF cells enable True
iniset $NOVA_CELLS_CONF cells cell_type compute iniset $NOVA_CELLS_CONF cells cell_type compute

9
lib/rpc_backend
View File

@ -104,8 +104,9 @@ function restart_rpc_backend {
# builds transport url string # builds transport url string
function get_transport_url { function get_transport_url {
local virtual_host=$1
if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
echo "rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/" echo "rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/$virtual_host"
fi fi
} }
@ -114,11 +115,9 @@ function iniset_rpc_backend {
local package=$1 local package=$1
local file=$2 local file=$2
local section=${3:-DEFAULT} local section=${3:-DEFAULT}
local virtual_host=$4
if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
iniset $file $section rpc_backend "rabbit" iniset $file $section transport_url $(get_transport_url "$virtual_host")
iniset $file oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST
iniset $file oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
iniset $file oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
if [ -n "$RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD" ]; then if [ -n "$RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD" ]; then
iniset $file oslo_messaging_rabbit heartbeat_timeout_threshold $RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD iniset $file oslo_messaging_rabbit heartbeat_timeout_threshold $RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD
fi fi