diff options
Diffstat (limited to 'fdio.infra.ansible/roles/vault')
| -rw-r--r-- | fdio.infra.ansible/roles/vault/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | fdio.infra.ansible/roles/vault/templates/vault_backend_consul.j2 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fdio.infra.ansible/roles/vault/defaults/main.yaml b/fdio.infra.ansible/roles/vault/defaults/main.yaml index 5dd3db63c1..69386146d0 100644 --- a/fdio.infra.ansible/roles/vault/defaults/main.yaml +++ b/fdio.infra.ansible/roles/vault/defaults/main.yaml @@ -107,7 +107,7 @@ vault_backend_tls_key_file: "{{ vault_tls_key_file }}" vault_backend_tls_ca_file: "{{ vault_tls_ca_file }}" vault_consul: "127.0.0.1:8500" -vault_consul_path: "vault" +vault_consul_path: "vault_data" vault_consul_service: "vault" vault_consul_scheme: "http" @@ -146,7 +146,7 @@ vault_tls_disable: "{{ lookup('env','VAULT_TLS_DISABLE') | default(1, true) }}" vault_tls_gossip: "{{ lookup('env','VAULT_TLS_GOSSIP') | default(0, true) }}" vault_tls_copy_keys: true -vault_protocol: "{% if vault_tls_disable %}http{% else %}https{% endif %}" +vault_protocol: "{% if vault_tls_disable %}https{% else %}https{% endif %}" vault_tls_cert_file: "{{ lookup('env','VAULT_TLS_CERT_FILE') | default('server.crt', true) }}" vault_tls_key_file: "{{ lookup('env','VAULT_TLS_KEY_FILE') | default('server.key', true) }}" vault_tls_ca_file: "{{ lookup('env','VAULT_TLS_CA_CRT') | default('ca.crt', true) }}" diff --git a/fdio.infra.ansible/roles/vault/templates/vault_backend_consul.j2 b/fdio.infra.ansible/roles/vault/templates/vault_backend_consul.j2 index c45498af90..32f2fdcb01 100644 --- a/fdio.infra.ansible/roles/vault/templates/vault_backend_consul.j2 +++ b/fdio.infra.ansible/roles/vault/templates/vault_backend_consul.j2 @@ -12,4 +12,4 @@ backend "consul" { tls_ca_file="{{ vault_backend_tls_config_path }}/{{ vault_backend_tls_ca_file }}" {% endif %} -}
\ No newline at end of file +} |