Update oslo messaging configuration section for fullstack

rabbit_virtual_host, rabbit_hosts, rabbit_userid, and rabbit_password
for oslo_messaging are now deprecated in the DEFAULT config section.

Those settings should be provided under the oslo_messaging_rabbit section
now.

Closes-Bug: 1487322

Change-Id: I12d560aefceeadb03f7a4ee1e4e2f920b2cf57f2

diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py
index 9848e2c2f0d6fb7064152e52bd5c019da3df82cd..c4efa8197f2c0d3de40f83e3186fd97aeae540d4 100644 (file)
--- a/neutron/tests/fullstack/resources/config.py
+++ b/neutron/tests/fullstack/resources/config.py
@@ -114,16 +114,18 @@ class NeutronConfigFixture(ConfigFixture):
                 'core_plugin': 'neutron.plugins.ml2.plugin.Ml2Plugin',
                 'service_plugins': ('neutron.services.l3_router.'
                                     'l3_router_plugin.L3RouterPlugin'),
-                'rabbit_userid': rabbitmq_environment.user,
-                'rabbit_password': rabbitmq_environment.password,
-                'rabbit_hosts': '127.0.0.1',
-                'rabbit_virtual_host': rabbitmq_environment.vhost,
                 'auth_strategy': 'noauth',
                 'verbose': 'True',
                 'debug': 'True',
             },
             'database': {
                 'connection': connection,
+            },
+            'oslo_messaging_rabbit': {
+                'rabbit_userid': rabbitmq_environment.user,
+                'rabbit_password': rabbitmq_environment.password,
+                'rabbit_hosts': '127.0.0.1',
+                'rabbit_virtual_host': rabbitmq_environment.vhost,
             }
         })