mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-10-31 06:26:19 -02:30
Remove obsolete "Flatcar Container Linux by Kinvolk" fact checks (#13528)
Signed-off-by: Ali Afsharzadeh <afsharzadeh8@gmail.com>
This commit is contained in:
@@ -2,8 +2,8 @@
|
||||
dependencies:
|
||||
- role: adduser
|
||||
user: "{{ addusers.etcd }}"
|
||||
when: not (ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
|
||||
when: not (ansible_facts['os_family'] in ["Flatcar", "ClearLinux"] or is_fedora_coreos)
|
||||
- role: adduser
|
||||
user: "{{ addusers.kube }}"
|
||||
when: not (ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
|
||||
when: not (ansible_facts['os_family'] in ["Flatcar", "ClearLinux"] or is_fedora_coreos)
|
||||
- role: etcd_defaults
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
/usr/local/share/ca-certificates/etcd-ca.crt
|
||||
{%- elif ansible_facts['os_family'] == "RedHat" -%}
|
||||
/etc/pki/ca-trust/source/anchors/etcd-ca.crt
|
||||
{%- elif ansible_facts['os_family'] in ["Flatcar", "Flatcar Container Linux by Kinvolk"] -%}
|
||||
{%- elif ansible_facts['os_family'] == "Flatcar" -%}
|
||||
/etc/ssl/certs/etcd-ca.pem
|
||||
{%- elif ansible_facts['os_family'] == "Suse" -%}
|
||||
/etc/pki/trust/anchors/etcd-ca.pem
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
- name: Gen_certs | update ca-certificates (Debian/Ubuntu/SUSE/Flatcar) # noqa no-handler
|
||||
command: update-ca-certificates
|
||||
when: etcd_ca_cert.changed and ansible_facts['os_family'] in ["Debian", "Flatcar", "Flatcar Container Linux by Kinvolk", "Suse"]
|
||||
when: etcd_ca_cert.changed and ansible_facts['os_family'] in ["Debian", "Flatcar", "Suse"]
|
||||
|
||||
- name: Gen_certs | update ca-certificates (RedHat) # noqa no-handler
|
||||
command: update-ca-trust extract
|
||||
|
||||
Reference in New Issue
Block a user