From c3762364025fe76e74d86893ca3f47a98c3fcedf Mon Sep 17 00:00:00 2001 From: Yikun Jiang Date: Fri, 2 Nov 2018 09:39:59 +0800 Subject: [PATCH] Remove out-of-date configurations in setup.cfg We add the oslo_messaging.notify.drivers configuration in [1] for backwards compat with Havana notification_driver configuration values, and add the oslo_middleware configuration in [2] for backwards compatibility with Juno middleware configurations. But now these configuration is already out-of-date and useless, so we remove these configurations in this patch. [1] bcd9f363ff8a10ff30795c54f471a8c6d76450fe [2] c4897471777949983912676ad46ad99c42ed2b22 Change-Id: I92792a98bb21e2759549949333dba82df4345c01 --- setup.cfg | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/setup.cfg b/setup.cfg index 1ce900a58d0..ac768d2df01 100644 --- a/setup.cfg +++ b/setup.cfg @@ -71,17 +71,6 @@ console_scripts = cinder-volume-usage-audit = cinder.cmd.volume_usage_audit:main wsgi_scripts = cinder-wsgi = cinder.wsgi.wsgi:initialize_application -# These are for backwards compat with Havana notification_driver configuration values -oslo_messaging.notify.drivers = - cinder.openstack.common.notifier.log_notifier = oslo_messaging.notify._impl_log:LogDriver - cinder.openstack.common.notifier.no_op_notifier = oslo_messaging.notify._impl_noop:NoOpDriver - cinder.openstack.common.notifier.rpc_notifier2 = oslo_messaging.notify.messaging:MessagingV2Driver - cinder.openstack.common.notifier.rpc_notifier = oslo_messaging.notify.messaging:MessagingDriver - cinder.openstack.common.notifier.test_notifier = oslo_messaging.notify._impl_test:TestDriver -# These are for backwards compatibility with Juno middleware configurations -oslo_middleware = - cinder.openstack.common.middleware.request_id = oslo_middleware.request_id - cinder.database.migration_backend = sqlalchemy = oslo_db.sqlalchemy.migration