Merge "Homogenize the topics conf variable on templates"

2018-03-13 07:35:49 +00:00
parent d4057c5aa4 b84bee79c3
commit 08b4930e29
6 changed files with 6 additions and 6 deletions
--- a/ansible/roles/heat/templates/heat.conf.j2
+++ b/ansible/roles/heat/templates/heat.conf.j2
@@ -79,7 +79,7 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messagingv2
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}
--- a/ansible/roles/magnum/templates/magnum.conf.j2
+++ b/ansible/roles/magnum/templates/magnum.conf.j2
@@ -85,7 +85,7 @@ cert_manager_type = x509keypair
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messaging
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}
--- a/ansible/roles/sahara/templates/sahara.conf.j2
+++ b/ansible/roles/sahara/templates/sahara.conf.j2
@@ -44,7 +44,7 @@ auth_type = password
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messagingv2
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}
--- a/ansible/roles/senlin/templates/senlin.conf.j2
+++ b/ansible/roles/senlin/templates/senlin.conf.j2
@@ -47,7 +47,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messagingv2
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}
--- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2
+++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2
@@ -33,7 +33,7 @@ max_retries = -1
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messagingv2
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}
--- a/ansible/roles/trove/templates/trove.conf.j2
+++ b/ansible/roles/trove/templates/trove.conf.j2
@@ -44,7 +44,7 @@ auth_type = password
 transport_url = {{ notify_transport_url }}
 {% if enable_ceilometer | bool %}
 driver = messagingv2
-topics = 'notifications'
+topics = notifications
 {% else %}
 driver = noop
 {% endif %}