openstack/charm-neutron-gateway
Code Issues Proposed changes

Update notification_driver for oslo.messaging

Browse Source 
The 'neutron.openstack.common.notifier.rpc_notifier' notification
driver key was removed from neutron in Ocata; 'messaging' has been
provided directly from oslo.messaging since icehouse, so switch to
using the newer, correct value for configuration of notifications.

Change-Id: If39d98da6848479f223cc7bc137da1a5aba1823d
Closes-Bug: 1681452
This commit is contained in:
James Page 2017-04-10 15:24:01 +01:00
parent 442ac04b4b
commit 4efc95a857
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/icehouse/neutron.conf
View File

@ -9,7 +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.rpc_notifier notification_driver = messaging
{% if network_device_mtu -%} {% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }} network_device_mtu = {{ network_device_mtu }}
{% endif -%} {% endif -%}

2
templates/kilo/neutron.conf
View File

@ -8,7 +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.rpc_notifier notification_driver = messaging
{% if network_device_mtu -%} {% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }} network_device_mtu = {{ network_device_mtu }}
{% endif -%} {% endif -%}

3
tests/basic_deployment.py
View File

@ -609,8 +609,7 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
'debug': 'False', 'debug': 'False',
'core_plugin': 'ml2', 'core_plugin': 'ml2',
'control_exchange': 'neutron', 'control_exchange': 'neutron',
'notification_driver': 'neutron.openstack.common.notifier.' 'notification_driver': 'messaging',
'rpc_notifier',
}, },
'agent': { 'agent': {
'root_helper': 'sudo /usr/bin/neutron-rootwrap ' 'root_helper': 'sudo /usr/bin/neutron-rootwrap '