ansible-collections/hcp-ansible
ansible-collections/hcp-ansible
4
0
Fork 0
Code Issues 3 Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

fix: various inconsistencies and idempotence issues related to variable computing

Browse Source
This commit is contained in:
Bertrand Lanson 2024-05-03 22:25:03 +02:00
parent 7ffa720824
commit 4e0c90f110
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/group_vars/all/all.yml
View File

@ -3,7 +3,7 @@
# helper options # # helper options #
################## ##################
manage_pip_packages_allow_break_system_packages: true manage_pip_packages_allow_break_system_packages: "{{ ansible_distribution == 'Debian' and ansible_distribution_version == '12' }}"
vault_versions: vault_versions:
host: "{{ vault_version if vault_version != 'latest' else vault_version + '*' }}" host: "{{ vault_version if vault_version != 'latest' else vault_version + '*' }}"
@ -19,12 +19,14 @@ nomad_versions:
configuration_directory: "{{ lookup('env', 'PWD') }}/etc/hashistack" configuration_directory: "{{ lookup('env', 'PWD') }}/etc/hashistack"
sub_configuration_directories: sub_configuration_directories:
secrets: "{{ configuration_directory }}/secrets"
certificates: "{{ configuration_directory }}/certificates" certificates: "{{ configuration_directory }}/certificates"
nomad_servers: "{{ configuration_directory }}/nomad_servers" nomad_servers: "{{ configuration_directory }}/nomad_servers"
vault_servers: "{{ configuration_directory }}/vault_servers" vault_servers: "{{ configuration_directory }}/vault_servers"
consul_servers: "{{ configuration_directory }}/consul_servers" consul_servers: "{{ configuration_directory }}/consul_servers"
configuration_global_vars_file: "globals.yml" configuration_global_vars_file: "globals.yml"
configuration_credentials_vars_file: "credentials.yml"
hashistack_remote_config_dir: "/etc/hashistack" hashistack_remote_config_dir: "/etc/hashistack"
hashistack_remote_data_dir: "/opt/hashistack" hashistack_remote_data_dir: "/opt/hashistack"

2
playbooks/group_vars/all/consul.yml
View File

@ -83,7 +83,7 @@ hashi_consul_configuration:
dns_config: "{{ consul_dns_configuration }}" dns_config: "{{ consul_dns_configuration }}"
ports: ports:
dns: 8600 dns: 8600
http: "{{ ('8500'|int) if not }}" http: 8500 # "{{ ('8500'|int) if not }}"
https: -1 https: -1
grpc: 8502 grpc: 8502
grpc_tls: 8503 grpc_tls: 8503

11
playbooks/group_vars/all/vault.yml
View File

@ -60,12 +60,11 @@ hashi_vault_env_variables: {}
hashi_vault_config_dir: "/etc/vault.d" hashi_vault_config_dir: "/etc/vault.d"
hashi_vault_data_dir: "/opt/vault" hashi_vault_data_dir: "/opt/vault"
hashi_vault_extra_files: true hashi_vault_extra_files: true
hashi_vault_extra_files_list: "{{ ([] + hashi_vault_extra_files_set:
(vault_certificates_extra_files_dir if vault_enable_tls else []) + "{{ (vault_certificates_extra_files_dir if vault_enable_tls else []) |
(vault_plugin_extra_files_dir if vault_enable_plugins else []) + union(vault_plugin_extra_files_dir if vault_enable_plugins else []) |
vault_extra_files_list) union(vault_extra_files_list) |
| unique list }}"
}}"
hashi_vault_extra_files_src: "{{ sub_configuration_directories.vault_servers }}/config" hashi_vault_extra_files_src: "{{ sub_configuration_directories.vault_servers }}/config"
hashi_vault_extra_files_dst: "{{ hashi_vault_config_dir }}/config" hashi_vault_extra_files_dst: "{{ hashi_vault_config_dir }}/config"
hashi_vault_extra_container_volumes: "{{ default_container_extra_volumes | union(extra_vault_container_volumes) | unique }}" hashi_vault_extra_container_volumes: "{{ default_container_extra_volumes | union(extra_vault_container_volumes) | unique }}"