diff options
| author | Pierre Blanc <pierre.blanc@ormuco.com> | 2018-01-12 16:39:47 -0500 |
|---|---|---|
| committer | Pierre Blanc <pierre.blanc@ormuco.com> | 2018-01-12 16:39:47 -0500 |
| commit | b84bee79c3bb17b416f4a6aac5199b61528fb14a (patch) | |
| tree | 1c48a38f053d8f1c52e1932b808e18e6cdd343c0 | |
| parent | 95cd3347077955bff1c8167a0f20b801eada0e65 (diff) | |
| download | kolla-ansible-b84bee79c3bb17b416f4a6aac5199b61528fb14a.tar.gz kolla-ansible-b84bee79c3bb17b416f4a6aac5199b61528fb14a.zip | |
Homogenize the topics conf variable on templates
In several templates the variable topics is configured
between simple quotes.
It is better to remove them to use the openstack default value.
Change-Id: I418c714240b38b2853a5c746203eac31588e841a
| -rw-r--r-- | ansible/roles/heat/templates/heat.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/magnum/templates/magnum.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/sahara/templates/sahara.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/senlin/templates/senlin.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/trove/templates/trove-taskmanager.conf.j2 | 2 | ||||
| -rw-r--r-- | ansible/roles/trove/templates/trove.conf.j2 | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 317bee5ff..df7d4abd6 100644 --- 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 %} diff --git a/ansible/roles/magnum/templates/magnum.conf.j2 b/ansible/roles/magnum/templates/magnum.conf.j2 index 22b8c2d8e..72560f927 100644 --- a/ansible/roles/magnum/templates/magnum.conf.j2 +++ b/ansible/roles/magnum/templates/magnum.conf.j2 @@ -88,7 +88,7 @@ cert_manager_type = x509keypair transport_url = {{ notify_transport_url }} {% if enable_ceilometer | bool %} driver = messaging -topics = 'notifications' +topics = notifications {% else %} driver = noop {% endif %} diff --git a/ansible/roles/sahara/templates/sahara.conf.j2 b/ansible/roles/sahara/templates/sahara.conf.j2 index 0f4f6617e..4813373a8 100644 --- 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 %} diff --git a/ansible/roles/senlin/templates/senlin.conf.j2 b/ansible/roles/senlin/templates/senlin.conf.j2 index 0feb60303..18fa41ecf 100644 --- 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 %} diff --git a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 index 3f35dc3e1..df1066459 100644 --- a/ansible/roles/trove/templates/trove-taskmanager.conf.j2 +++ b/ansible/roles/trove/templates/trove-taskmanager.conf.j2 @@ -28,7 +28,7 @@ max_retries = -1 transport_url = {{ notify_transport_url }} {% if enable_ceilometer | bool %} driver = messagingv2 -topics = 'notifications' +topics = notifications {% else %} driver = noop {% endif %} diff --git a/ansible/roles/trove/templates/trove.conf.j2 b/ansible/roles/trove/templates/trove.conf.j2 index 500c638ac..bfe3d3370 100644 --- a/ansible/roles/trove/templates/trove.conf.j2 +++ b/ansible/roles/trove/templates/trove.conf.j2 @@ -41,7 +41,7 @@ auth_type = password transport_url = {{ notify_transport_url }} {% if enable_ceilometer | bool %} driver = messagingv2 -topics = 'notifications' +topics = notifications {% else %} driver = noop {% endif %} |