Compare commits

...

3 Commits

3 changed files with 23 additions and 19 deletions

View File

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

View File

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

View File

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