From 92450109b147fccc9fcd4c43f31041a66beee9a4 Mon Sep 17 00:00:00 2001 From: houming-wang Date: Tue, 19 Jan 2016 17:59:05 +0800 Subject: [PATCH] "notification_driver" from group "DEFAULT" is deprecated Option "notification_driver" from group "DEFAULT" is deprecated. Use option "driver" from group "oslo_messaging_notifications" Reference link: [1] https://github.com/openstack/oslo.messaging/blob/master/ oslo_messaging/notify/notifier.py#L34 Change-Id: I3e211ac315bb582961ad03e2cf06d4409eb20ed3 Closes-Bug: #1535611 --- devstack/lib/magnum | 2 +- doc/source/dev/dev-manual-devstack.rst | 4 ++-- etc/magnum/magnum.conf.sample | 10 ++++++---- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index f78e1030ac..e3e10ef303 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -177,7 +177,7 @@ function create_magnum_conf { fi if is_service_enabled ceilometer; then - iniset $MAGNUM_CONF DEFAULT notification_driver "messaging" + iniset $MAGNUM_CONF oslo_messaging_notifications driver "messaging" fi if is_service_enabled barbican; then diff --git a/doc/source/dev/dev-manual-devstack.rst b/doc/source/dev/dev-manual-devstack.rst index 8a6216a3d2..d387b3354d 100644 --- a/doc/source/dev/dev-manual-devstack.rst +++ b/doc/source/dev/dev-manual-devstack.rst @@ -194,8 +194,8 @@ Configure magnum:: sudo sed -i "s/#auth_uri\s*=.*/auth_uri=http:\/\/127.0.0.1:5000\/v2.0/" \ /etc/magnum/magnum.conf - # set notification_driver (if using ceilometer) - sudo sed -i "s/#notification_driver\s*=.*/notification_driver=messaging/" \ + # set oslo messaging notifications driver (if using ceilometer) + sudo sed -i "s/#driver\s*=.*/driver=messaging/" \ /etc/magnum/magnum.conf Clone and install the magnum client:: diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample index e57a4fdd9a..f5478509a8 100644 --- a/etc/magnum/magnum.conf.sample +++ b/etc/magnum/magnum.conf.sample @@ -221,10 +221,6 @@ # Deprecated group/name - [DEFAULT]/rpc_thread_pool_size #executor_thread_pool_size = 64 -# The Drivers(s) to handle sending notifications. Possible values are -# messaging, messagingv2, routing, log, test, noop (multi valued) -#notification_driver = - # A URL representing the messaging driver to use for notifications. If # not set, we fall back to the same configuration used for RPC. # (string value) @@ -1230,6 +1226,12 @@ # Deprecated group/name - [DEFAULT]/fake_rabbit #fake_rabbit = false +[oslo_messaging_notifications] +# The Drivers(s) to handle sending notifications. Possible values are +# messaging, messagingv2, routing, log, test, noop (multi valued) +# Deprecated group/name - [DEFAULT]/notification_driver +#driver = + [oslo_policy]