From 3acb86805b590dc1553bfe4591d39538d21a7619 Mon Sep 17 00:00:00 2001 From: mkrasilnikov Date: Tue, 5 Sep 2017 00:16:44 +0300 Subject: [PATCH] Rename vault_address to vault_bind_address --- roles/vault/defaults/main.yml | 6 +++--- roles/vault/tasks/shared/issue_cert.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/vault/defaults/main.yml b/roles/vault/defaults/main.yml index d4e2ed66c..2320ae862 100644 --- a/roles/vault/defaults/main.yml +++ b/roles/vault/defaults/main.yml @@ -40,7 +40,7 @@ vault_temp_container_name: vault-temp vault_image_repo: "vault" vault_image_tag: "{{ vault_version }}" -vault_address: 0.0.0.0 +vault_bind_address: 0.0.0.0 vault_port: 8200 vault_etcd_url: "https://{{ hostvars[groups.etcd[0]]['ip']|d(hostvars[groups.etcd[0]]['ansible_default_ipv4']['address']) }}:2379" @@ -54,7 +54,7 @@ vault_temp_config: default_lease_ttl: "{{ vault_default_lease_ttl }}" listener: tcp: - address: "{{ vault_address }}:{{ vault_port }}" + address: "{{ vault_bind_address }}:{{ vault_port }}" tls_disable: "true" max_lease_ttl: "{{ vault_max_lease_ttl }}" @@ -70,7 +70,7 @@ vault_config: max_lease_ttl: "{{ vault_max_lease_ttl }}" listener: tcp: - address: "{{ vault_address }}:{{ vault_port }}" + address: "{{ vault_bind_address }}:{{ vault_port }}" tls_cert_file: "{{ vault_cert_dir }}/api.pem" tls_key_file: "{{ vault_cert_dir }}/api-key.pem" diff --git a/roles/vault/tasks/shared/issue_cert.yml b/roles/vault/tasks/shared/issue_cert.yml index 0b14d77c5..844183816 100644 --- a/roles/vault/tasks/shared/issue_cert.yml +++ b/roles/vault/tasks/shared/issue_cert.yml @@ -108,7 +108,7 @@ - name: issue_cert | Copy certificate serial to all hosts copy: - content: "{{ hostvars[issue_cert_hosts|first]['issue_cert_result']['json']['data']['serial_number'] }}" + wcontent: "{{ issue_cert_result['issue_cert_result']['json']['data']['serial_number'] }}" dest: "{{ issue_cert_path.rsplit('.', 1)|first }}.serial" group: "{{ issue_cert_file_group | d('root' )}}" mode: "{{ issue_cert_file_mode | d('0640') }}"