diff --git a/common/playbooks/accounting.yaml b/common/playbooks/accounting.yaml index c16aabe6eb86fe1ec7208209ce284a7a80241cf9..53d4cf8a94c5d6e818bb5a95202002bf2e059818 100644 --- a/common/playbooks/accounting.yaml +++ b/common/playbooks/accounting.yaml @@ -9,11 +9,11 @@ when: "'egi-accounting' not in ansible_local.helm_repos | map(attribute='name') | list" - name: Get credentials from Vault for accounting set_fact: - secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'accounting') | path_join, + secrets: "{{ lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'accounting') | join('/'), token_validate=false) }}" - name: Get accounting installation ID from Vault set_fact: - secrets: "{{ secrets | combine(lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | path_join, + secrets: "{{ secrets | combine(lookup('community.hashi_vault.hashi_vault', (vault_mount_point, 'site-' + site_name) | join('/'), token_validate=false)) }}" - name: Debug accounting secrets debug: @@ -27,7 +27,7 @@ - name: Deploy/upgrade accounting instance vars: name: "notebooks-accounting" - version: "0.2.1" + version: "0.2.2" shell: |- helm status --namespace accounting {{ name }} if [ $? -ne 0 ]; then diff --git a/testing/playbooks/accounting.yaml b/testing/playbooks/accounting.yaml new file mode 120000 index 0000000000000000000000000000000000000000..89284849af173ceeb1d8ceeece8f76cf7be45ea9 --- /dev/null +++ b/testing/playbooks/accounting.yaml @@ -0,0 +1 @@ +../../common/playbooks/accounting.yaml \ No newline at end of file