Skip to content

Commit 45da777

Browse files
committed
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
1 parent 8ddbf6f commit 45da777

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

lib/cinder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,7 @@ function configure_cinder {
315315
fi
316316

317317
if is_service_enabled ceilometer; then
318-
iniset $CINDER_CONF oslo_messaging_notifications driver "messaging"
318+
iniset $CINDER_CONF oslo_messaging_notifications driver "messagingv2"
319319
fi
320320

321321
if is_service_enabled tls-proxy; then

lib/glance

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function configure_glance {
112112
iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS"
113113
iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
114114
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
116116
iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
117117
iniset $GLANCE_REGISTRY_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
118118

@@ -125,7 +125,7 @@ function configure_glance {
125125
iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
126126
iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
127127
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
129129
iniset_rpc_backend glance $GLANCE_API_CONF
130130
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
131131
iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"

lib/neutron-legacy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -798,7 +798,7 @@ function _configure_neutron_metadata_agent {
798798
}
799799

800800
function _configure_neutron_ceilometer_notifications {
801-
iniset $NEUTRON_CONF oslo_messaging_notifications driver messaging
801+
iniset $NEUTRON_CONF oslo_messaging_notifications driver messagingv2
802802
}
803803

804804
function _configure_neutron_metering {

lib/nova

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -575,7 +575,7 @@ function create_nova_conf {
575575

576576
# Set the oslo messaging driver to the typical default. This does not
577577
# 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"
579579
iniset_rpc_backend nova $NOVA_CONF
580580
iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
581581

0 commit comments

Comments
 (0)