openstack
/
openstack-ansible-os_heat
Code Issues Proposed changes

Correct notification driver 

The notification driver setup was resulting in the driver and connection string
on the same line. This is caused by the case statement and how jinja formats
the template when a case statement is present. This change modifies how the
driver string is created using a ternary, which will eliminate the case
statement and render the value of the diver correctly.

Change-Id: I8bb44ec141a19793b0c8d84bccf799c0e8f4cc4d
Signed-off-by: Kevin Carter <kevin.carter@rackspace.com>
This commit is contained in:
Kevin Carter 2019-02-07 22:32:50 +00:00
parent 31a46e0adc
commit 53c3079bde
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/heat.conf.j2
View File

@ -68,7 +68,7 @@ enable_proxy_headers_parsing = True
# Ceilometer options
[oslo_messaging_notifications]
driver = {% if heat_ceilometer_enabled %}messagingv2{% else %}noop{% endif %}
driver = {{ (heat_ceilometer_enabled | bool) | ternary('messagingv2', 'noop') }}
transport_url = {{ heat_oslomsg_notify_transport }}://{% for host in heat_oslomsg_notify_servers.split(',') %}{{ heat_oslomsg_notify_userid }}:{{ heat_oslomsg_notify_password }}@{{ host }}:{{ heat_oslomsg_notify_port }}{% if not loop.last %},{% else %}/{{ heat_oslomsg_notify_vhost }}{% if heat_oslomsg_notify_use_ssl | bool %}?ssl=1{% else %}?ssl=0{% endif %}{% endif %}{% endfor %}