Browse code

Merge "Use get_notification_url when configuring notifications"

Jenkins authored on 2017/09/02 19:26:26
Showing 2 changed files
... ...
@@ -542,7 +542,7 @@ function create_nova_conf {
542 542
     # Set the oslo messaging driver to the typical default. This does not
543 543
     # enable notifications, but it will allow them to function when enabled.
544 544
     iniset $NOVA_CONF oslo_messaging_notifications driver "messagingv2"
545
-    iniset $NOVA_CONF oslo_messaging_notifications transport_url $(get_transport_url)
545
+    iniset $NOVA_CONF oslo_messaging_notifications transport_url $(get_notification_url)
546 546
     iniset_rpc_backend nova $NOVA_CONF
547 547
     iniset $NOVA_CONF glance api_servers "$GLANCE_URL"
548 548
 
... ...
@@ -114,7 +114,7 @@ function rpc_backend_add_vhost {
114 114
     fi
115 115
 }
116 116
 
117
-# builds transport url string
117
+# Returns the address of the RPC backend in URL format.
118 118
 function get_transport_url {
119 119
     local virtual_host=$1
120 120
     if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then
... ...
@@ -122,8 +122,9 @@ function get_transport_url {
122 122
     fi
123 123
 }
124 124
 
125
-# Repeat the definition, in case get_transport_url is overriden for RPC purpose.
126
-# get_notification_url can then be used to talk to rabbit for notifications.
125
+# Returns the address of the Notification backend in URL format.  This
126
+# should be used to set the transport_url option in the
127
+# oslo_messaging_notifications group.
127 128
 function get_notification_url {
128 129
     local virtual_host=$1
129 130
     if is_service_enabled rabbit || { [ -n "$RABBIT_HOST" ] && [ -n "$RABBIT_PASSWORD" ]; }; then