From 83a13333c9e6784ce9f22c2cd3ee0ad95f8a3353 Mon Sep 17 00:00:00 2001 From: Asara Date: Mon, 30 Aug 2021 17:39:24 -0400 Subject: [PATCH] Add vault_cacert to fbsd vault calls --- ansible/roles/common/tasks/FreeBSD_pki.yml | 4 ++-- ansible/roles/consul_server/tasks/FreeBSD.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/roles/common/tasks/FreeBSD_pki.yml b/ansible/roles/common/tasks/FreeBSD_pki.yml index aa1d599..57ae6ba 100644 --- a/ansible/roles/common/tasks/FreeBSD_pki.yml +++ b/ansible/roles/common/tasks/FreeBSD_pki.yml @@ -83,9 +83,9 @@ executable: /usr/local/bin/bash environment: VAULT_ADDR: https://vault.service.masked.name:8200 - VAULT_TOKEN: "{{ lookup('file', lookup('env', 'HOME') + '/.vault-token') }}" - VAULT_FORMAT: json VAULT_CACERT: /etc/ssl/certs/MaskedName_Root_CA.crt + VAULT_FORMAT: json + VAULT_TOKEN: "{{ lookup('file', lookup('env', 'HOME') + '/.vault-token') }}" register: cert_data when: exp.rc != 0 diff --git a/ansible/roles/consul_server/tasks/FreeBSD.yml b/ansible/roles/consul_server/tasks/FreeBSD.yml index df036a8..5aca79d 100644 --- a/ansible/roles/consul_server/tasks/FreeBSD.yml +++ b/ansible/roles/consul_server/tasks/FreeBSD.yml @@ -43,8 +43,9 @@ executable: /usr/local/bin/bash environment: VAULT_ADDR: https://vault.service.masked.name:8200 - VAULT_TOKEN: "{{ lookup('file', lookup('env', 'HOME') + '/.vault-token') }}" + VAULT_CACERT: /etc/ssl/certs/MaskedName_Root_CA.crt VAULT_FORMAT: json + VAULT_TOKEN: "{{ lookup('file', lookup('env', 'HOME') + '/.vault-token') }}" register: cert_data when: exp.rc != 0