Merge "notification_driver is deprecated to driver"

This commit is contained in:
Jenkins 2016-01-22 00:11:49 +00:00 committed by Gerrit Code Review
commit c09c079ef9
4 changed files with 5 additions and 5 deletions

View File

@ -299,7 +299,7 @@ function configure_cinder {
fi
if is_service_enabled ceilometer; then
iniset $CINDER_CONF DEFAULT notification_driver "messaging"
iniset $CINDER_CONF oslo_messaging_notifications driver "messaging"
fi
if is_service_enabled tls-proxy; then

View File

@ -113,7 +113,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 DEFAULT notification_driver messaging
iniset $GLANCE_REGISTRY_CONF oslo_messaging_notifications driver messaging
iniset_rpc_backend glance $GLANCE_REGISTRY_CONF
iniset $GLANCE_REGISTRY_CONF DEFAULT graceful_shutdown_timeout "$SERVICE_GRACEFUL_SHUTDOWN_TIMEOUT"
@ -126,7 +126,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 DEFAULT notification_driver messaging
iniset $GLANCE_API_CONF oslo_messaging_notifications driver messaging
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"

View File

@ -1072,7 +1072,7 @@ function _configure_neutron_metadata_agent {
}
function _configure_neutron_ceilometer_notifications {
iniset $NEUTRON_CONF DEFAULT notification_driver messaging
iniset $NEUTRON_CONF oslo_messaging_notifications driver messaging
}
function _configure_neutron_lbaas {

View File

@ -556,7 +556,7 @@ function create_nova_conf {
iniset $NOVA_CONF DEFAULT instance_usage_audit "True"
iniset $NOVA_CONF DEFAULT instance_usage_audit_period "hour"
iniset $NOVA_CONF DEFAULT notify_on_state_change "vm_and_task_state"
iniset $NOVA_CONF DEFAULT notification_driver "messaging"
iniset $NOVA_CONF oslo_messaging_notifications driver "messaging"
fi
# All nova-compute workers need to know the vnc configuration options