Define a new function for notifications URL

Code Issues Proposed changes

This defines a new function get_notification_url, which returns the URL
of RabbitMQ when you want connect to it, and uses in
ceilometermiddleware. This fixes an issue when we try to use AMQP for
RPC, but not for notifications.
Change-Id: I14450b2440806a17a90e5ddefc243868fdbe4f2c

This commit is contained in:

Thomas Herve

2017年04月13日 14:27:35 +02:00

parent 42414520b7

commit 26e431dbd7

2 changed files with 10 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

9
lib/rpc_backend

View File

@@ -122,6 +122,15 @@ function get_transport_url {

fi

}

# Repeat the definition, in case get_transport_url is overriden for RPC purpose.

# get_notification_url can then be used to talk to rabbit for notifications.

function get_notification_url {

local virtual_host=1ドル

if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then

echo "rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/$virtual_host"

fi

}

# iniset configuration

function iniset_rpc_backend {

local package=1ドル

2
lib/swift

View File

@@ -419,7 +419,7 @@ function configure_swift {

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer "set log_level" "WARN"

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer paste.filter_factory "ceilometermiddleware.swift:filter_factory"

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer control_exchange "swift"

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer url $(get_transport_url)

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer url $(get_notification_url)

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer driver "messaging"

iniset ${SWIFT_CONFIG_PROXY_SERVER} filter:ceilometer topic "notifications"

SWIFT_EXTRAS_MIDDLEWARE_LAST="${SWIFT_EXTRAS_MIDDLEWARE_LAST} ceilometer"