Merge "Change to messagingv2 for oslo_messaging_notifications.driver"
This commit is contained in:
commit
17c2f028cf
@ -315,7 +315,7 @@ function configure_cinder {
|
||||
fi
|
||||
|
||||
if is_service_enabled ceilometer; then
|
||||
iniset $CINDER_CONF oslo_messaging_notifications driver "messaging"
|
||||
iniset $CINDER_CONF oslo_messaging_notifications driver "messagingv2"
|
||||
fi
|
||||
|
||||
if is_service_enabled tls-proxy; then
|
||||
|
@ -112,7 +112,7 @@ function configure_glance {
|
||||
iniset $GLANCE_REGISTRY_CONF DEFAULT workers "$API_WORKERS"
|
||||
iniset $GLANCE_REGISTRY_CONF paste_deploy flavor keystone
|
||||
configure_auth_token_middleware $GLANCE_REGISTRY_CONF glance $GLANCE_AUTH_CACHE_DIR/registry
|
||||
iniset $GLANCE_REGISTRY_CONF oslo_messaging_notifications driver messaging
|
||||
iniset $GLANCE_REGISTRY_CONF oslo_messaging_notifications driver messagingv2
|
||||
iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
|
||||
iniset $GLANCE_REGISTRY_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
|
||||
|
||||
@ -125,7 +125,7 @@ function configure_glance {
|
||||
iniset $GLANCE_API_CONF DEFAULT image_cache_dir $GLANCE_CACHE_DIR/
|
||||
iniset $GLANCE_API_CONF paste_deploy flavor keystone+cachemanagement
|
||||
configure_auth_token_middleware $GLANCE_API_CONF glance $GLANCE_AUTH_CACHE_DIR/api
|
||||
iniset $GLANCE_API_CONF oslo_messaging_notifications driver messaging
|
||||
iniset $GLANCE_API_CONF oslo_messaging_notifications driver messagingv2
|
||||
iniset_rpc_backend glance $GLANCE_API_CONF
|
||||
if [ "$VIRT_DRIVER" = 'xenserver' ]; then
|
||||
iniset $GLANCE_API_CONF DEFAULT container_formats "ami,ari,aki,bare,ovf,tgz"
|
||||
|
@ -798,7 +798,7 @@ function _configure_neutron_metadata_agent {
|
||||
}
|
||||
|
||||
function _configure_neutron_ceilometer_notifications {
|
||||
iniset $NEUTRON_CONF oslo_messaging_notifications driver messaging
|
||||
iniset $NEUTRON_CONF oslo_messaging_notifications driver messagingv2
|
||||
}
|
||||
|
||||
function _configure_neutron_metering {
|
||||
|
2
lib/nova
2
lib/nova
@ -575,7 +575,7 @@ function create_nova_conf {
|
||||
|
||||
# Set the oslo messaging driver to the typical default. This does not
|
||||
# enable notifications, but it will allow them to function when enabled.
|
||||
iniset $NOVA_CONF oslo_messaging_notifications driver "messaging"
|
||||
iniset $NOVA_CONF oslo_messaging_notifications driver "messagingv2"
|
||||
iniset_rpc_backend nova $NOVA_CONF
|
||||
iniset $NOVA_CONF glance api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user