1. devstack
  2. Commit 45da777d2526acd355da974eb338695559dd64c8
Browse code

Change to messagingv2 for oslo_messaging_notifications.driver

The oslo.messaging docs on the notification messaging driver
says that "messaging" (1.0) is a legacy format and you should
use messagingv2 unless otherwise required for that old format.

By default we should be testing with messagingv2.

Change-Id: I3031afe7551a0c8dde46e1ccfacff445fb68e122

Matt Riedemann authored on 2017/03/06 03:07:39
Showing 4 changed files
lib/cinder
History View file @ 45da777
... ... 
@@ -315,7 +315,7 @@ function configure_cinder {
315 315 
     fi
316 316
317 317 
     if is_service_enabled ceilometer; then
318 
-        iniset $CINDER_CONF oslo_messaging_notifications driver "messaging"
318 
+        iniset $CINDER_CONF oslo_messaging_notifications driver "messagingv2"
319 319 
     fi
320 320
321 321 
     if is_service_enabled tls-proxy; then
lib/glance
History View file @ 45da777
... ... 
@@ -112,7 +112,7 @@ function configure_glance {
112 112 
     iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS"
113 113 
     iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
114 114 
     configure_auth_token_middleware $GLANCE_REGISTRY_CONF glance $GLANCE_AUTH_CACHE_DIR/registry
115 
-    iniset $GLANCE_REGISTRY_CONF oslo_messaging_notifications driver messaging
115 
+    iniset $GLANCE_REGISTRY_CONF oslo_messaging_notifications driver messagingv2
116 116 
     iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
117 117 
     iniset $GLANCE_REGISTRY_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
118 118
... ... 
@@ -125,7 +125,7 @@ function configure_glance {
125 125 
     iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
126 126 
     iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
127 127 
     configure_auth_token_middleware $GLANCE_API_CONF glance $GLANCE_AUTH_CACHE_DIR/api
128 
-    iniset $GLANCE_API_CONF oslo_messaging_notifications driver messaging
128 
+    iniset $GLANCE_API_CONF oslo_messaging_notifications driver messagingv2
129 129 
     iniset_rpc_backend glance $GLANCE_API_CONF
130 130 
     if [ "$VIRT_DRIVER" = 'xenserver' ]; then
131 131 
         iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"
lib/neutron-legacy
History View file @ 45da777
... ... 
@@ -798,7 +798,7 @@ function _configure_neutron_metadata_agent {
798 798 
 }
799 799
800 800 
 function _configure_neutron_ceilometer_notifications {
801 
-    iniset $NEUTRON_CONF oslo_messaging_notifications driver messaging
801 
+    iniset $NEUTRON_CONF oslo_messaging_notifications driver messagingv2
802 802 
 }
803 803
804 804 
 function _configure_neutron_metering {
lib/nova
History View file @ 45da777
... ... 
@@ -575,7 +575,7 @@ function create_nova_conf {
575 575
576 576 
     # Set the oslo messaging driver to the typical default. This does not
577 577 
     # enable notifications, but it will allow them to function when enabled.
578 
-    iniset $NOVA_CONF oslo_messaging_notifications driver "messaging"
578 
+    iniset $NOVA_CONF oslo_messaging_notifications driver "messagingv2"
579 579 
     iniset_rpc_backend nova $NOVA_CONF
580 580 
     iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
581 581