Merge "Update notification config >= mitaka"

hooks/charmhelpers/contrib/openstack/templates/section-oslo-notifications

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

templates/mitaka/neutron.conf

@@ -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

tests/basic_deployment.py

@@ -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'] = {