Merge pull request #2003 from abelgana/master

Change altnames to alt_names
This commit is contained in:
Brad Beam 2017-12-05 08:48:32 -06:00 committed by GitHub
commit 27ead5d4fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -84,7 +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
altnames: alt_names:
- "vault.{{ system_namespace }}.svc.{{ dns_domain }}" - "vault.{{ system_namespace }}.svc.{{ dns_domain }}"
- "vault.{{ system_namespace }}.svc" - "vault.{{ system_namespace }}.svc"
- "vault.{{ system_namespace }}" - "vault.{{ system_namespace }}"

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.altnames|default() }}" issue_cert_alt_names: "{{ groups.vault + ['localhost'] + vault_ca_options.vault.alt_names|default() }}"
issue_cert_hosts: "{{ groups.vault }}" issue_cert_hosts: "{{ groups.vault }}"
issue_cert_ip_sans: >- issue_cert_ip_sans: >-
[ [