kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2059 from bradbeam/vaultalt 

Fixing alt_names for vault cert generation
pull/2067/head
Brad Beam 2017-12-12 09:28:51 -06:00 committed by GitHub
parent 6291881943 d3850a4da5
commit 39ce1bd8be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,11 +84,7 @@ vault_ca_options:
format: pem format: pem
ttl: "{{ vault_max_lease_ttl }}" ttl: "{{ vault_max_lease_ttl }}"
exclude_cn_from_sans: true exclude_cn_from_sans: true
alt_names: alt_names: "vault.{{ system_namespace }}.svc.{{ dns_domain }},vault.{{ system_namespace }}.svc,vault.{{ system_namespace }},vault"
- "vault.{{ system_namespace }}.svc.{{ dns_domain }}"
- "vault.{{ system_namespace }}.svc"
- "vault.{{ system_namespace }}"
- "vault"
etcd: etcd:
common_name: etcd common_name: etcd
format: pem format: pem

2
roles/vault/tasks/bootstrap/gen_vault_certs.yml
View File

@ -2,7 +2,7 @@
- include: ../shared/issue_cert.yml - include: ../shared/issue_cert.yml
vars: vars:
issue_cert_common_name: "{{ vault_pki_mounts.vault.roles[0].name }}" issue_cert_common_name: "{{ vault_pki_mounts.vault.roles[0].name }}"
issue_cert_alt_names: "{{ groups['vault'] + ['localhost'] + vault_ca_options.vault.alt_names|default() | join(',') }}" issue_cert_alt_names: "{{ groups['vault'] + ['localhost'] + (vault_ca_options['vault']['alt_names'].split(','))|default() }}"
issue_cert_hosts: "{{ groups['vault'] }}" issue_cert_hosts: "{{ groups['vault'] }}"
issue_cert_ip_sans: >- issue_cert_ip_sans: >-
[ [