openstack/charm-trilio-data-mover
Code Issues Proposed changes

Fix white space in config files

Browse Source 
The tvault-contego.conf and tvault-object-store.conf files have jinja
templating to remove whitespace before and after the endif control
segments, which lead to invalid ini style config files. Correct the
white space removal directives.

Closes-Bug: 1949608
Change-Id: Id6634fb3825b9d6b9e003f8c477e21d798dfe046
This commit is contained in:
Billy Olsen 2021-11-03 15:51:49 -07:00
parent 4550a20201
commit c9d4c4d368
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/templates/tvault-contego.conf
View File

@ -30,7 +30,7 @@ vault_s3_bucket = {{ options.tv_s3_bucket }}
vault_s3_endpoint_url = {{ options.tv_s3_endpoint_url }} vault_s3_endpoint_url = {{ options.tv_s3_endpoint_url }}
{% if options.trilio_s3_cert_config.cert_file -%} {% if options.trilio_s3_cert_config.cert_file -%}
vault_s3_ssl_cert = {{ options.trilio_s3_cert_config.cert_file }} vault_s3_ssl_cert = {{ options.trilio_s3_cert_config.cert_file }}
{%- endif -%} {% endif %}
{% endif -%} {% endif -%}
# MISC # MISC

2
src/templates/tvault-object-store.conf
View File

@ -16,7 +16,7 @@ vault_s3_bucket = {{ options.tv_s3_bucket }}
vault_s3_endpoint_url = {{ options.tv_s3_endpoint_url }} vault_s3_endpoint_url = {{ options.tv_s3_endpoint_url }}
{% if options.trilio_s3_cert_config.cert_file -%} {% if options.trilio_s3_cert_config.cert_file -%}
vault_s3_ssl_cert = {{ options.trilio_s3_cert_config.cert_file }} vault_s3_ssl_cert = {{ options.trilio_s3_cert_config.cert_file }}
{%- endif -%} {% endif %}
[s3fuse_sys_admin] [s3fuse_sys_admin]
helper_command = sudo /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf privsep-helper helper_command = sudo /usr/bin/nova-rootwrap /etc/nova/rootwrap.conf privsep-helper