openstack/charm-neutron-gateway
Code Issues Proposed changes

Use rpc_notifier driver for notifications

Browse Source 
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
This commit is contained in:
Edward Hope-Morley 2016-09-06 12:42:42 +01:00
parent 76a20a615c
commit 279ae9a3ee
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/icehouse/neutron.conf
View File

@ -9,8 +9,7 @@ lock_path = /var/lock/neutron
core_plugin = {{ core_plugin }} core_plugin = {{ core_plugin }}
{% include "parts/rabbitmq" %} {% include "parts/rabbitmq" %}
control_exchange = neutron control_exchange = neutron
notification_driver = neutron.openstack.common.notifier.list_notifier notification_driver = neutron.openstack.common.notifier.rpc_notifier
list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
{% if network_device_mtu -%} {% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }} network_device_mtu = {{ network_device_mtu }}
{% endif -%} {% endif -%}

3
templates/kilo/neutron.conf
View File

@ -8,8 +8,7 @@ verbose = {{ verbose }}
debug = {{ debug }} debug = {{ debug }}
core_plugin = {{ core_plugin }} core_plugin = {{ core_plugin }}
control_exchange = neutron control_exchange = neutron
notification_driver = neutron.openstack.common.notifier.list_notifier notification_driver = neutron.openstack.common.notifier.rpc_notifier
list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
{% if network_device_mtu -%} {% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }} network_device_mtu = {{ network_device_mtu }}
{% endif -%} {% endif -%}

9
tests/basic_deployment.py
View File

@ -452,11 +452,6 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
if ret: if ret:
message = u.relation_error('mysql shared-db', ret) message = u.relation_error('mysql shared-db', ret)
amulet.raise_status(amulet.FAIL, msg=message) 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): def test_208_neutron_api_amqp_relation(self):
"""Verify the neutron-api to rabbitmq-server amqp relation data""" """Verify the neutron-api to rabbitmq-server amqp relation data"""
@ -584,9 +579,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'core_plugin': 'ml2', 'core_plugin': 'ml2',
'control_exchange': 'neutron', 'control_exchange': 'neutron',
'notification_driver': 'neutron.openstack.common.notifier.' 'notification_driver': 'neutron.openstack.common.notifier.'
'list_notifier', 'rpc_notifier',
'list_notifier_drivers': 'neutron.openstack.common.'
'notifier.rabbit_notifier',
}, },
'agent': { 'agent': {
'root_helper': 'sudo /usr/bin/neutron-rootwrap ' 'root_helper': 'sudo /usr/bin/neutron-rootwrap '