mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-10-31 06:26:19 -02:30
Replace injected Ansible fact variables in etcd role (#13338)
This commit is contained in:
@@ -2,15 +2,15 @@
|
||||
- name: Gen_certs | target ca-certificate store file
|
||||
set_fact:
|
||||
ca_cert_path: |-
|
||||
{% if ansible_os_family == "Debian" -%}
|
||||
{% if ansible_facts['os_family'] == "Debian" -%}
|
||||
/usr/local/share/ca-certificates/etcd-ca.crt
|
||||
{%- elif ansible_os_family == "RedHat" -%}
|
||||
{%- elif ansible_facts['os_family'] == "RedHat" -%}
|
||||
/etc/pki/ca-trust/source/anchors/etcd-ca.crt
|
||||
{%- elif ansible_os_family in ["Flatcar", "Flatcar Container Linux by Kinvolk"] -%}
|
||||
{%- elif ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk"] -%}
|
||||
/etc/ssl/certs/etcd-ca.pem
|
||||
{%- elif ansible_os_family == "Suse" -%}
|
||||
{%- elif ansible_facts['os_family'] == "Suse" -%}
|
||||
/etc/pki/trust/anchors/etcd-ca.pem
|
||||
{%- elif ansible_os_family == "ClearLinux" -%}
|
||||
{%- elif ansible_facts['os_family'] == "ClearLinux" -%}
|
||||
/usr/share/ca-certs/etcd-ca.pem
|
||||
{%- endif %}
|
||||
tags:
|
||||
@@ -26,12 +26,12 @@
|
||||
|
||||
- name: Gen_certs | update ca-certificates (Debian/Ubuntu/SUSE/Flatcar) # noqa no-handler
|
||||
command: update-ca-certificates
|
||||
when: etcd_ca_cert.changed and ansible_os_family in ["Debian", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse"]
|
||||
when: etcd_ca_cert.changed and ansible_facts['os_family'] in ["Debian", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse"]
|
||||
|
||||
- name: Gen_certs | update ca-certificates (RedHat) # noqa no-handler
|
||||
command: update-ca-trust extract
|
||||
when: etcd_ca_cert.changed and ansible_os_family == "RedHat"
|
||||
when: etcd_ca_cert.changed and ansible_facts['os_family'] == "RedHat"
|
||||
|
||||
- name: Gen_certs | update ca-certificates (ClearLinux) # noqa no-handler
|
||||
command: clrtrust add "{{ ca_cert_path }}"
|
||||
when: etcd_ca_cert.changed and ansible_os_family == "ClearLinux"
|
||||
when: etcd_ca_cert.changed and ansible_facts['os_family'] == "ClearLinux"
|
||||
|
||||
Reference in New Issue
Block a user