External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-26 23:46:11 -03:30
Code Issues Packages Projects Releases Wiki Activity

Add support to Ansible 2.9 (#5361)

Browse Source
This commit is contained in:
Maxime Guyot
2019-12-05 16:24:32 +01:00
committed by Kubernetes Prow Robot
parent 7da2083986
commit b15d41a96a
27 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/vault/roles/vault/tasks/bootstrap/ca_trust.yml
View File

@@ -13,7 +13,7 @@
/usr/local/share/ca-certificates/vault-ca.crt
{%- elif ansible_os_family == "RedHat" -%}
/etc/pki/ca-trust/source/anchors/vault-ca.crt
{%- elif ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] -%}
{%- elif ansible_os_family in ["Coreos", "Container Linux by CoreOS"] -%}
/etc/ssl/certs/vault-ca.pem
{%- endif %}
@@ -25,7 +25,7 @@
- name: bootstrap/ca_trust | update ca-certificates (Debian/Ubuntu/CoreOS)
command: update-ca-certificates
when: vault_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS", "Container Linux by CoreOS"]
when: vault_ca_cert.changed and ansible_os_family in ["Debian", "CoreOS", "Coreos", "Container Linux by CoreOS"]
- name: bootstrap/ca_trust | update ca-certificates (RedHat)
command: update-ca-trust extract