From 279ae9a3ee2a6536e9f416a248ba5d1e46b46534 Mon Sep 17 00:00:00 2001
From: Edward Hope-Morley <edward.hope-morley@canonical.com>
Date: Tue, 6 Sep 2016 12:42:42 +0100
Subject: [PATCH] Use rpc_notifier driver for notifications

list_notifier was deprecated a very long time ago so
all versions since Icehouse should use the
rpc_notifier.

Also removed unnecessary amulet test that is causing
race conditions.

Change-Id: I44a2e6f2cc98f58373eddc50aa0dea268e94c753
Closes-Bug: 1620564
---
 templates/icehouse/neutron.conf | 3 +--
 templates/kilo/neutron.conf     | 3 +--
 tests/basic_deployment.py       | 9 +--------
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/templates/icehouse/neutron.conf b/templates/icehouse/neutron.conf
index 99180973..ebdbdf36 100644
--- a/templates/icehouse/neutron.conf
+++ b/templates/icehouse/neutron.conf
@@ -9,8 +9,7 @@ lock_path = /var/lock/neutron
 core_plugin = {{ core_plugin }} 
 {% include "parts/rabbitmq" %}
 control_exchange = neutron
-notification_driver = neutron.openstack.common.notifier.list_notifier
-list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 {% if network_device_mtu -%}
 network_device_mtu = {{ network_device_mtu }}
 {% endif -%}
diff --git a/templates/kilo/neutron.conf b/templates/kilo/neutron.conf
index d691c605..dc07dc3e 100644
--- a/templates/kilo/neutron.conf
+++ b/templates/kilo/neutron.conf
@@ -8,8 +8,7 @@ verbose = {{ verbose }}
 debug = {{ debug }}
 core_plugin = {{ core_plugin }}
 control_exchange = neutron
-notification_driver = neutron.openstack.common.notifier.list_notifier
-list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
+notification_driver = neutron.openstack.common.notifier.rpc_notifier
 {% if network_device_mtu -%}
 network_device_mtu = {{ network_device_mtu }}
 {% endif -%}
diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py
index 30070135..abe29d34 100644
--- a/tests/basic_deployment.py
+++ b/tests/basic_deployment.py
@@ -452,11 +452,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
         if ret:
             message = u.relation_error('mysql shared-db', ret)
             amulet.raise_status(amulet.FAIL, msg=message)
-        relation_data = unit.relation(relation[0], relation[1])
-        allowed_units = relation_data['allowed_units'].split()
-        if 'neutron-api/0' not in allowed_units:
-            message = 'neutron-api/0 not found in allowed_units'
-            amulet.raise_status(amulet.FAIL, msg=message)
 
     def test_208_neutron_api_amqp_relation(self):
         """Verify the neutron-api to rabbitmq-server amqp relation data"""
@@ -584,9 +579,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
                 'core_plugin': 'ml2',
                 'control_exchange': 'neutron',
                 'notification_driver': 'neutron.openstack.common.notifier.'
-                                       'list_notifier',
-                'list_notifier_drivers': 'neutron.openstack.common.'
-                                         'notifier.rabbit_notifier',
+                                       'rpc_notifier',
             },
             'agent': {
                 'root_helper': 'sudo /usr/bin/neutron-rootwrap '