diff --git a/ansible/roles/heat/templates/heat.conf.j2 b/ansible/roles/heat/templates/heat.conf.j2 index 317bee5ff0..df7d4abd6b 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 22b8c2d8e2..72560f9274 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 0f4f6617ef..4813373a89 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 0feb603038..18fa41ecf9 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 3f35dc3e1c..df10664593 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 500c638ac9..bfe3d3370f 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 %}