From 9049b903f598452812ca73f304f11fc006679181 Mon Sep 17 00:00:00 2001
From: James Page <james.page@ubuntu.com>
Date: Tue, 26 Feb 2019 10:51:05 +0100
Subject: [PATCH] Use transport_url for Ocata or later

Switch to using [DEFAULT]transport_url for configuration of
oslo.messaging connectivity to RabbitMQ.

Use section-oslo-messaging-rabbit to set [oslo_messaging_rabbit]
sectional configuration options for HA and SSL.

Update amulet test to only run ceilometer upgrade in deployments
with Gnocchi (>= Xenial/Queens).

Change-Id: If0ee7a09bac3bb4c5e6823adb1994ad3a120f9d5
Closes-Bug: 1817672
---
 src/templates/ocata/aodh.conf | 43 +++++++++++++++++++++++++++++++++++
 src/tests/basic_deployment.py |  2 +-
 2 files changed, 44 insertions(+), 1 deletion(-)
 create mode 100644 src/templates/ocata/aodh.conf

diff --git a/src/templates/ocata/aodh.conf b/src/templates/ocata/aodh.conf
new file mode 100644
index 0000000..6ec7763
--- /dev/null
+++ b/src/templates/ocata/aodh.conf
@@ -0,0 +1,43 @@
+[DEFAULT]
+debug = {{ options.debug }}
+
+{% include "parts/section-transport-url" %}
+
+[api]
+port = {{ options.service_listen_info.aodh_api.port }}
+workers = {{ options.workers }}
+
+gnocchi_external_project_owner = services
+{% if identity_service.service_domain -%}
+gnocchi_external_domain_name = {{ identity_service.service_domain }}
+{% endif %}
+
+[database]
+{% if shared_db.uri -%}
+connection = {{ shared_db.uri }}
+{% elif mongodb -%}
+connection = mongodb://{{ mongodb.hostname }}:{{ mongodb.port }}/aodh
+{%- endif %}
+
+{% include "parts/section-keystone-authtoken" %}
+
+[service_credentials]
+{% if identity_service.auth_host -%}
+auth_type = password
+region_name = {{ options.region }}
+auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
+{% if identity_service.service_domain -%}
+project_domain_name = {{ identity_service.service_domain }}
+user_domain_name = {{ identity_service.service_domain }}
+{% endif -%}
+project_name = {{ identity_service.service_tenant }}
+username = {{ identity_service.service_username }}
+password = {{ identity_service.service_password }}
+{%- endif %}
+{% if options.use_internal_endpoints -%}
+interface = internalURL
+{%- endif %}
+
+{% include "parts/section-oslo-messaging-rabbit" %}
+
+{% include "parts/section-oslo-middleware" %}
diff --git a/src/tests/basic_deployment.py b/src/tests/basic_deployment.py
index a532d12..1aada2d 100644
--- a/src/tests/basic_deployment.py
+++ b/src/tests/basic_deployment.py
@@ -43,7 +43,7 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
 
         self.d.sentry.wait()
         self._initialize_tests()
-        if self._get_openstack_release() >= self.xenial_pike:
+        if self._get_openstack_release() >= self.xenial_queens:
             self.run_ceilometer_upgrade_action()
 
     def _add_services(self):