C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rename vault_address to vault_bind_address

Browse source
This commit is contained in:
mkrasilnikov 2017-09-05 00:16:44 +03:00
parent bf0af1cd3d
commit 3acb86805b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
roles/vault/defaults/main.yml
View file

@ -40,7 +40,7 @@ vault_temp_container_name: vault-temp
vault_image_repo: "vault" vault_image_repo: "vault"
vault_image_tag: "{{ vault_version }}" vault_image_tag: "{{ vault_version }}"
vault_address: 0.0.0.0 vault_bind_address: 0.0.0.0
vault_port: 8200 vault_port: 8200
vault_etcd_url: "https://{{ hostvars[groups.etcd[0]]['ip']|d(hostvars[groups.etcd[0]]['ansible_default_ipv4']['address']) }}:2379" 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 }}" default_lease_ttl: "{{ vault_default_lease_ttl }}"
listener: listener:
tcp: tcp:
address: "{{ vault_address }}:{{ vault_port }}" address: "{{ vault_bind_address }}:{{ vault_port }}"
tls_disable: "true" tls_disable: "true"
max_lease_ttl: "{{ vault_max_lease_ttl }}" max_lease_ttl: "{{ vault_max_lease_ttl }}"
@ -70,7 +70,7 @@ vault_config:
max_lease_ttl: "{{ vault_max_lease_ttl }}" max_lease_ttl: "{{ vault_max_lease_ttl }}"
listener: listener:
tcp: tcp:
address: "{{ vault_address }}:{{ vault_port }}" address: "{{ vault_bind_address }}:{{ vault_port }}"
tls_cert_file: "{{ vault_cert_dir }}/api.pem" tls_cert_file: "{{ vault_cert_dir }}/api.pem"
tls_key_file: "{{ vault_cert_dir }}/api-key.pem" tls_key_file: "{{ vault_cert_dir }}/api-key.pem"

2
roles/vault/tasks/shared/issue_cert.yml
View file

@ -108,7 +108,7 @@
- name: issue_cert | Copy certificate serial to all hosts - name: issue_cert | Copy certificate serial to all hosts
copy: 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" dest: "{{ issue_cert_path.rsplit('.', 1)|first }}.serial"
group: "{{ issue_cert_file_group | d('root' )}}" group: "{{ issue_cert_file_group | d('root' )}}"
mode: "{{ issue_cert_file_mode | d('0640') }}" mode: "{{ issue_cert_file_mode | d('0640') }}"