From ecf7bf7fde0ec1af9db3b884cae5ecfcd7a8b5bf Mon Sep 17 00:00:00 2001 From: pmikus Date: Wed, 31 Jul 2024 11:10:19 +0200 Subject: feat(ansible): env variables for nomad and vault Signed-off-by: Peter Mikus Change-Id: I8a27c6ae832237947db6d28c052af0d15cac19a0 --- fdio.infra.ansible/roles/nomad/tasks/main.yaml | 8 ++++---- fdio.infra.ansible/roles/vault/tasks/main.yaml | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/fdio.infra.ansible/roles/nomad/tasks/main.yaml b/fdio.infra.ansible/roles/nomad/tasks/main.yaml index 72b78458f8..79088f5018 100644 --- a/fdio.infra.ansible/roles/nomad/tasks/main.yaml +++ b/fdio.infra.ansible/roles/nomad/tasks/main.yaml @@ -126,12 +126,12 @@ mode: 0644 create: true loop: - - "export NOMAD_ADDR=https://nomad-server.service.consul:4646" + - "export NOMAD_ADDR=http://nomad.service.consul:4646" - "export NOMAD_CACERT={{ nomad_tls_ca_file }}" - - "export NOMAD_CLIENT_CERT={{ nomad_tls_cli_cert_file }}" - - "export NOMAD_CLIENT_KEY={{ nomad_tls_cli_key_file }}" + - "export NOMAD_CLIENT_CERT={{ nomad_tls_cert_file }}" + - "export NOMAD_CLIENT_KEY={{ nomad_tls_key_file }}" tags: - - nomad-conf + - nomad-conf-env - name: System.d Script ansible.builtin.template: diff --git a/fdio.infra.ansible/roles/vault/tasks/main.yaml b/fdio.infra.ansible/roles/vault/tasks/main.yaml index 3fceadfb4a..5a8ac282d5 100644 --- a/fdio.infra.ansible/roles/vault/tasks/main.yaml +++ b/fdio.infra.ansible/roles/vault/tasks/main.yaml @@ -118,6 +118,17 @@ # tags: # - vault-conf +- name: Vault CLI Environment Variables + ansible.builtin.lineinfile: + path: "/etc/profile.d/vault.sh" + line: "{{ item }}" + mode: 0644 + create: true + loop: + - "export VAULT_ADDR=http://vault.service.consul:8200" + tags: + - vault-conf-env + - name: Conf - System.d Script ansible.builtin.template: src: "vault_systemd.service.j2" -- cgit 1.2.3-korg