Compare commits

..

No commits in common. "ca65a44eac64fd28777532e8322459711e9c2c11" and "c7ed8c09a3d13754eadc03e0ad5698673308817e" have entirely different histories.

3 changed files with 19 additions and 23 deletions

View File

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

View File

@ -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 #

View File

@ -6,24 +6,20 @@
vars:
_config_to_merge: "{{ vault_tls_listener_configuration }}"
ansible.builtin.set_fact:
vault_listener_configuration: >-
{{
vault_listener_configuration: "{{
vault_listener_configuration |
zip(vault_tls_listener_configuration) |
map('combine', list_merge='append', recursive=true) |
list
}}
combine(_config_to_merge, recursive=true)
}}"
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_extra_listener_configuration
}}
vault_listener_configuration: "{{
vault_listener_configuration |
combine(_config_to_merge, recursive=true)
}}"
- name: "Vault | Add certificates directory to extra_files_dir"
ansible.builtin.set_fact: