feat(vault): adjust variable merging behaviour for allowing multiple tcp and unix socket listeners

roles/nomad/tasks/merge_variables.yml

@@ -79,8 +79,8 @@
         _config_to_merge:
           consul: "{{ nomad_consul_integration_configuration }}"
       ansible.builtin.set_fact:
-        hashicorp_nomad_configuration: "{{
+        nomad_configuration: "{{
-          hashicorp_nomad_configuration |
+          nomad_configuration |
           combine(_config_to_merge, recursive=true)
           }}"
 

roles/vault/defaults/main.yml

@@ -48,12 +48,12 @@ vault_storage_configuration:
 
 vault_enable_tls: false
 vault_listener_configuration:
-  tcp:
+  - tcp:
       address: "{{ vault_cluster_addr }}:8200"
       tls_disable: true
 
 vault_tls_listener_configuration:
-  tcp:
+  - tcp:
       tls_disable: false
       tls_cert_file: "{{ vault_certs_dir }}/cert.pem"
       tls_key_file: "{{ vault_certs_dir }}/key.pem"
@@ -64,7 +64,7 @@ vault_certificates_extra_files_dir:
   # - src: ""
   #   dest: "{{ vault_certs_dir }}"
 
-vault_extra_listener_configuration: {}
+vault_extra_listener_configuration: []
 
 ########################
 # service registration #

roles/vault/tasks/merge_variables.yml

@@ -6,20 +6,24 @@
       vars:
         _config_to_merge: "{{ vault_tls_listener_configuration }}"
       ansible.builtin.set_fact:
-        vault_listener_configuration: "{{
+        vault_listener_configuration: >-
+          {{
             vault_listener_configuration |
-          combine(_config_to_merge, recursive=true)
+            zip(vault_tls_listener_configuration) |
-          }}"
+            map('combine', list_merge='append', recursive=true) |
+            list
+          }}
       when: vault_enable_tls
 
     - name: "Vault | Merge extra listener configuration"
       vars:
         _config_to_merge: "{{ vault_extra_listener_configuration }}"
       ansible.builtin.set_fact:
-        vault_listener_configuration: "{{
+        vault_listener_configuration: >-
-          vault_listener_configuration |
+          {{
-          combine(_config_to_merge, recursive=true)
+            vault_listener_configuration +
-          }}"
+            vault_extra_listener_configuration
+          }}
 
     - name: "Vault | Add certificates directory to extra_files_dir"
       ansible.builtin.set_fact: