remove atomic support because reached end of live (#5783)

This commit is contained in:
spaced
2020-03-17 22:31:27 +01:00
committed by GitHub
parent 820d8e6ce6
commit 8ce5a9dd19
14 changed files with 27 additions and 87 deletions

View File

@@ -3,7 +3,6 @@ dependencies:
- role: adduser
user: "{{ addusers.kube }}"
when:
- not is_atomic
- not is_fedora_coreos
tags:
- kubelet

View File

@@ -22,7 +22,7 @@
tags:
- facts
- name: check if atomic host
- name: check if booted with ostree
stat:
path: /run/ostree-booted
register: ostree
@@ -39,15 +39,6 @@
set_fact:
is_fedora_coreos: "{{ ostree.stat.exists and os_variant_coreos is not changed }}"
- name: set is_atomic
set_fact:
is_atomic: "{{ ostree.stat.exists and not is_fedora_coreos }}"
- name: set kube_cert_group on atomic hosts
set_fact:
kube_cert_group: "kube"
when: is_atomic
- name: check resolvconf
shell: which resolvconf
register: resolvconf

View File

@@ -23,7 +23,6 @@
state: absent
when:
- ansible_distribution in ["CentOS","RedHat","OracleLinux"]
- not is_atomic
- not is_fedora_coreos
- name: Install python-dnf for latest RedHat versions
@@ -36,7 +35,6 @@
- ansible_distribution == "Fedora"
- ansible_distribution_major_version|int > 21
- ansible_distribution_major_version|int <= 29
- not is_atomic
- not is_fedora_coreos
changed_when: False
tags:
@@ -51,7 +49,6 @@
when:
- ansible_distribution == "Fedora"
- ansible_distribution_major_version|int >= 30
- not is_atomic
- not is_fedora_coreos
changed_when: False
tags:
@@ -63,7 +60,6 @@
state: present
when:
- ansible_distribution in ["CentOS","RedHat"]
- not is_atomic
- not is_fedora_coreos
- epel_enabled|bool
tags:
@@ -83,7 +79,7 @@
until: pkgs_task_result is succeeded
retries: 4
delay: "{{ retry_stagger | random + 3 }}"
when: not (ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_atomic or is_fedora_coreos)
when: not (ansible_os_family in ["CoreOS", "Coreos", "Container Linux by CoreOS", "Flatcar", "Flatcar Container Linux by Kinvolk", "ClearLinux"] or is_fedora_coreos)
tags:
- bootstrap-os