Cleanup vault secret paths

cesnet-central/playbooks/notebooks.yaml

@@ -18,8 +18,10 @@
         - "../deployments/*.yaml"
     - name: Get Secrets from Vault for gateway
       set_fact:
-        gateways_token: "{{ {'cesnet-mcc': lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/gateway_authtoken:value',
+        gateways_token: "{{ {item: lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/gateway-' + item + ':authtoken',
           token_validate=false)} }}"
+      loop:
+        - cesnet-mcc
     # - name: Debug Deployments Secrets
     #   debug:
     #     msg: "{{ item.key }} = {{ item.value }}"

cesnet-mcc/playbooks/gateway.yaml

@@ -6,12 +6,17 @@
     namespace: gateway
     version: 3.2.2
   tasks:
+    - name: Get Secrets from Vault for gateway
+      vars:
+        name: cesnet-mcc
+      set_fact:
+        secrets: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/gateway-' + name, token_validate=false) }}"
     - name: Enterprise Gateway Configuration
       copy:
         dest: /tmp/gateway.yaml
         mode: 0640
         content: |
-          authToken: "{{ lookup('community.hashi_vault.hashi_vault', vault_mount_point + '/gateway_authtoken:value', token_validate=true) }}"
+          authToken: "{{ secrets['authtoken'] }}"
           global:
             rbac: true
           deployment: