From 266eecc0fe6aae41039d58b8f0385f213c221e1e Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Fri, 10 May 2019 21:44:55 +0200 Subject: [PATCH] Revert concat changes - {{}} does work This reverts commit 3c493feba99e37fb5b39b13d5c48c9ac515c8460. --- roles/fas_server/templates/configmap.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/fas_server/templates/configmap.yml b/roles/fas_server/templates/configmap.yml index c82475f677..d8f2a4d8e0 100644 --- a/roles/fas_server/templates/configmap.yml +++ b/roles/fas_server/templates/configmap.yml @@ -81,16 +81,16 @@ data: # FAS stuff {{ load_file('fas-app.conf.j2') | indent() }} fas_sync_keytab: |- - {{ lookup('file', private + '/files/keytabs/' + env + '/fas_sync') | indent() }} + {{ lookup('file', '{{ private }}/files/keytabs/{{env}}/fas_sync') | indent() }} fas_sync_cert.pem: |- - {{ lookup('file', roles_path + '/fas_server/files/ipa.' + env + '.pem') | indent() }} + {{ lookup('file', '{{ roles_path }}/fas_server/files/ipa.{{env}}.pem') | indent() }} fas-log.cfg: |- - {{ lookup('file', roles_path + '/fas_server/files/fas-log.cfg') | indent() }} + {{ lookup('file', '{{ roles_path }}/fas_server/files/fas-log.cfg') | indent() }} pubring.gpg: |- - {{ lookup('file', private + '/files/fas-gpg/pubring.gpg') | indent() }} + {{ lookup('file', '{{ private }}/files/fas-gpg/pubring.gpg') | indent() }} fas.cfg: |- {{ load_file('fas.cfg.j2') | indent() }} export-bugzilla.cfg: |- {{ load_file('export-bugzilla.cfg.j2') | indent() }} export-bugzilla: |- - {{ lookup('file', roles_path + '/fas_server/files/export-bugzilla') | indent() }} + {{ lookup('file', '{{ roles_path }}/fas_server/files/export-bugzilla') | indent() }}