openstack
/
charm-glance-simplestreams-sync
Code Issues Proposed changes

SSL CS certs are multi-line values 

When rendering the multi-line string in the identity.yaml
file, it is necessary to denote the multi-line string.

Change-Id: I6dca3e2445286423a785e1c0973fa7e1d43b6797
Closes-Bug: #1835490
This commit is contained in:
Chris MacNaughton 2019-07-08 10:09:40 +02:00 committed by Alex Kavanagh (tinwood)
parent d6c63c8e57
commit 02299812b4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
templates/identity.yaml
View File

@ -11,7 +11,8 @@ admin_tenant_name: {{ admin_tenant_name }}
admin_user: {{ admin_user }}
admin_password: {{ admin_password }}
{% if ssl_ca -%}
ssl_ca: {{ ssl_ca }}
ssl_ca: |
{{ ssl_ca | indent( width=2, indentfirst=True) }}
{% endif -%}
{% if api_version == '3' -%}
@ -36,7 +37,8 @@ rabbit_host: {{ rabbitmq_host }}
rabbit_use_ssl: True
rabbit_port: {{ rabbit_ssl_port }}
{% if rabbit_ssl_ca -%}
kombu_ssl_ca_certs: {{ rabbit_ssl_ca }}
kombu_ssl_ca_certs: |
{{ rabbit_ssl_ca | indent( width=2, indentfirst=True) }}
{% endif -%}
{% endif -%}
{% endif -%}