Merge "Homogenize the topics conf variable on templates"

This commit is contained in:
Zuul 2018-03-13 07:35:49 +00:00 committed by Gerrit Code Review
commit 08b4930e29
6 changed files with 6 additions and 6 deletions

View File

@ -79,7 +79,7 @@ auth_uri = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ keystone_publi
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messagingv2 driver = messagingv2
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

View File

@ -85,7 +85,7 @@ cert_manager_type = x509keypair
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messaging driver = messaging
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

View File

@ -44,7 +44,7 @@ auth_type = password
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messagingv2 driver = messagingv2
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

View File

@ -47,7 +47,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messagingv2 driver = messagingv2
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

View File

@ -33,7 +33,7 @@ max_retries = -1
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messagingv2 driver = messagingv2
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}

View File

@ -44,7 +44,7 @@ auth_type = password
transport_url = {{ notify_transport_url }} transport_url = {{ notify_transport_url }}
{% if enable_ceilometer | bool %} {% if enable_ceilometer | bool %}
driver = messagingv2 driver = messagingv2
topics = 'notifications' topics = notifications
{% else %} {% else %}
driver = noop driver = noop
{% endif %} {% endif %}