From 2f6ed91ace09489e0ab05c9a6785a8c92df41091 Mon Sep 17 00:00:00 2001 From: Kenneth Giusti Date: Mon, 7 Aug 2017 09:33:45 -0400 Subject: [PATCH] Add support for virtual_host parameter Change-Id: I08e1489e225bb13b6d8bb08807216ee1ab84d693 Partial-Bug: #1709081 --- devstack/plugin.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 4d1fd59..7fafd06 100644 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -15,13 +15,24 @@ # under the License. function get_transport_url { - echo "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672" + local virtual_host=$1 + echo "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/$virtual_host" } +function get_notification_url { + local virtual_host=$1 + echo "pika://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/$virtual_host" +} + +# Note: no need to override default 'rpc_backend_add_vhost' since the +# backend is also rabbitmq + function iniset_rpc_backend { local package=$1 local file=$2 local section=${3:-DEFAULT} + local virtual_host=$4 - iniset $file $section transport_url $(get_transport_url) + iniset $file $section transport_url $(get_transport_url "$virtual_host") + iniset $file oslo_messaging_notifications transport_url $(get_notification_url "$virtual_host") }