Update to 2022-09-04 00:00

This commit is contained in:
Daniel Berteaud
2022-09-04 00:00:24 +02:00
parent 24a4eac5e0
commit 6c02758759
9 changed files with 15 additions and 17 deletions

View File

@@ -56,7 +56,7 @@ nomad_base_conf:
# TLS Settings
# See the nomad_vault configuration if you want to integrate with vault to obtain and renew the certificates
# See the nomad_vault_tls configuration if you want to integrate with vault to obtain and renew the certificates
tls:
http: False
rpc: False
@@ -223,7 +223,7 @@ nomad_host_services: {}
nomad_services: "{{ nomad_base_services | combine(nomad_extra_services, recursive=True) | combine(nomad_host_services, recursive=True) }}"
# When using vault to setup TLS for Nomad
nomad_base_vault:
nomad_base_vault_tls:
enabled: False
address: "{{ nomad_conf.vault.address | default(omit) }}"
# Token to use to issue certificates
@@ -231,9 +231,9 @@ nomad_base_vault:
pki:
# The path of the PKI secret where cert will be issued
path: /pki/nomad
role: nomad-cluster
role: nomad-{{ nomad_conf.server.enabled | ternary('server', 'client') }}
ttl: 24h
nomad_extra_vault: {}
nomad_host_vault: {}
nomad_vault: "{{ nomad_base_vault | combine(nomad_extra_vault, recursive=True) | combine(nomad_host_vault, recursive=True) }}"
nomad_extra_vault_tls: {}
nomad_host_vault_tls: {}
nomad_vault_tls: "{{ nomad_base_vault_tls | combine(nomad_extra_vault_tls, recursive=True) | combine(nomad_host_vault_tls, recursive=True) }}"