Browse Source

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
changes/89/639289/2
James Page 3 months ago
parent
commit
9049b903f5
2 changed files with 44 additions and 1 deletions
  1. 43
    0
      src/templates/ocata/aodh.conf
  2. 1
    1
      src/tests/basic_deployment.py

+ 43
- 0
src/templates/ocata/aodh.conf View File

@@ -0,0 +1,43 @@
1
+[DEFAULT]
2
+debug = {{ options.debug }}
3
+
4
+{% include "parts/section-transport-url" %}
5
+
6
+[api]
7
+port = {{ options.service_listen_info.aodh_api.port }}
8
+workers = {{ options.workers }}
9
+
10
+gnocchi_external_project_owner = services
11
+{% if identity_service.service_domain -%}
12
+gnocchi_external_domain_name = {{ identity_service.service_domain }}
13
+{% endif %}
14
+
15
+[database]
16
+{% if shared_db.uri -%}
17
+connection = {{ shared_db.uri }}
18
+{% elif mongodb -%}
19
+connection = mongodb://{{ mongodb.hostname }}:{{ mongodb.port }}/aodh
20
+{%- endif %}
21
+
22
+{% include "parts/section-keystone-authtoken" %}
23
+
24
+[service_credentials]
25
+{% if identity_service.auth_host -%}
26
+auth_type = password
27
+region_name = {{ options.region }}
28
+auth_url = {{ identity_service.auth_protocol }}://{{ identity_service.auth_host }}:{{ identity_service.auth_port }}
29
+{% if identity_service.service_domain -%}
30
+project_domain_name = {{ identity_service.service_domain }}
31
+user_domain_name = {{ identity_service.service_domain }}
32
+{% endif -%}
33
+project_name = {{ identity_service.service_tenant }}
34
+username = {{ identity_service.service_username }}
35
+password = {{ identity_service.service_password }}
36
+{%- endif %}
37
+{% if options.use_internal_endpoints -%}
38
+interface = internalURL
39
+{%- endif %}
40
+
41
+{% include "parts/section-oslo-messaging-rabbit" %}
42
+
43
+{% include "parts/section-oslo-middleware" %}

+ 1
- 1
src/tests/basic_deployment.py View File

@@ -43,7 +43,7 @@ class AodhBasicDeployment(OpenStackAmuletDeployment):
43 43
 
44 44
         self.d.sentry.wait()
45 45
         self._initialize_tests()
46
-        if self._get_openstack_release() >= self.xenial_pike:
46
+        if self._get_openstack_release() >= self.xenial_queens:
47 47
             self.run_ceilometer_upgrade_action()
48 48
 
49 49
     def _add_services(self):

Loading…
Cancel
Save