openstack
/
charm-neutron-gateway
Code Issues Proposed changes

Update notification config >= mitaka 

Use oslo_messaging_notifications for mitaka or later releases
including setting the transport_url to the value provided by
the AMQP context.

This removes use of deprecated configuration options for
ceilometer notifications.

Change-Id: Ia76bd5070a1a419d35327a10c560b16e3c78320e
This commit is contained in:
James Page 2017-07-13 16:57:14 +01:00
parent 649ea8d040
commit d17e6b2b95
4 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/charmhelpers/contrib/charmsupport/nrpe.py
View File

@ -125,7 +125,7 @@ class CheckException(Exception):
class Check(object):
shortname_re = '[A-Za-z0-9-_]+$'
shortname_re = '[A-Za-z0-9-_.]+$'
service_template = ("""
#---------------------------------------------------
# This file is Juju managed

8
hooks/charmhelpers/contrib/openstack/templates/section-oslo-notifications Normal file
View File

@ -0,0 +1,8 @@
{% if transport_url -%}
[oslo_messaging_notifications]
driver = messagingv2
transport_url = {{ transport_url }}
{% if notification_topics -%}
topics = {{ notification_topics }}
{% endif -%}
{% endif -%}

25
templates/mitaka/neutron.conf Normal file
View File

@ -0,0 +1,25 @@
# kilo
###############################################################################
# [ WARNING ]
# Configuration file maintained by Juju. Local changes may be overwritten.
###############################################################################
[DEFAULT]
verbose = {{ verbose }}
debug = {{ debug }}
core_plugin = {{ core_plugin }}
{% if network_device_mtu -%}
network_device_mtu = {{ network_device_mtu }}
{% endif -%}
api_workers = {{ workers }}
{% include "section-zeromq" %}
[agent]
root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
{% include "section-rabbitmq-oslo" %}
{% include "section-oslo-notifications" %}
[oslo_concurrency]
lock_path = /var/lock/neutron

13
tests/basic_deployment.py
View File

@ -550,6 +550,19 @@ class NeutronGatewayBasicDeployment(OpenStackAmuletDeployment):
}
}
if self._get_openstack_release() >= self.trusty_mitaka:
del expected['DEFAULT']['control_exchange']
del expected['DEFAULT']['notification_driver']
connection_uri = (
"rabbit://neutron:{}@{}:5672/"
"openstack".format(rmq_ng_rel['password'],
rmq_ng_rel['hostname'])
)
expected['oslo_messaging_notifications'] = {
'driver': 'messagingv2',
'transport_url': connection_uri
}
if self._get_openstack_release() >= self.trusty_kilo:
# Kilo or later
expected['oslo_messaging_rabbit'] = {