Update to 2022-09-04 01:00

This commit is contained in:
Daniel Berteaud 2022-09-04 01:00:25 +02:00
parent 6c02758759
commit 59c5adc8fa
3 changed files with 12 additions and 3 deletions

View File

@ -110,6 +110,11 @@
where: ca.crt.tpl where: ca.crt.tpl
notify: restart consul-template-nomad notify: restart consul-template-nomad
tags: nomad
- when: nomad_vault_tls.enabled and nomad_conf.server.enabled
block:
- name: Deploy consul-template cli cert template - name: Deploy consul-template cli cert template
template: src=cli_cert.tpl.j2 dest={{ nomad_root_dir }}/consul-template/{{ item.where }} owner=root group=root template: src=cli_cert.tpl.j2 dest={{ nomad_root_dir }}/consul-template/{{ item.where }} owner=root group=root
loop: loop:

View File

@ -35,8 +35,10 @@ template {
exec { exec {
command = "systemctl reload nomad" command = "systemctl reload nomad"
} }
} }
{% if nomad_conf.server.enabled %}
template { template {
source = "{{ nomad_root_dir }}/consul-template/cli.crt.tpl" source = "{{ nomad_root_dir }}/consul-template/cli.crt.tpl"
left_delimiter = "[[" left_delimiter = "[["
@ -51,4 +53,4 @@ template {
destination = "{{ nomad_root_dir }}/tls/cli.key" destination = "{{ nomad_root_dir }}/tls/cli.key"
perms = 0640 perms = 0640
} }
{% endif %}

View File

@ -1,9 +1,11 @@
{% if nomad_conf.tls.http %} {% if nomad_conf.tls.http and nomad_conf.server.enabled %}
export NOMAD_ADDR=https://localhost:{{ nomad_services.http.port }} export NOMAD_ADDR=https://localhost:{{ nomad_services.http.port }}
export NOMAD_CACERT={{ nomad_conf.tls.ca_file }} export NOMAD_CACERT={{ nomad_conf.tls.ca_file }}
{% if nomad_vault_tls.enabled %} {% if nomad_vault_tls.enabled %}
export NOMAD_CLIENT_CERT={{ nomad_root_dir }}/tls/cli.crt export NOMAD_CLIENT_CERT={{ nomad_root_dir }}/tls/cli.crt
export NOMAD_CLIENT_KEY={{ nomad_root_dir }}/tls/cli.key export NOMAD_CLIENT_KEY={{ nomad_root_dir }}/tls/cli.key
export NOMAD_TLS_SERVER_NAME={{ nomad_conf.server.enabled | ternary('server', 'client') }}.global.nomad export NOMAD_TLS_SERVER_NAME=server.{{ nomad_conf.region }}.nomad
{% endif %} {% endif %}
{% else %}
# TLS not enabled or not running in server mode
{% endif %} {% endif %}