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

@@ -24,15 +24,6 @@
# CentOS ships with python installed
- name: Check if this is an atomic host
stat:
path: /run/ostree-booted
register: ostree
- name: Store the fact if this is an atomic host
set_fact:
is_atomic: "{{ ostree.stat.exists }}"
- name: Check presence of fastestmirror.conf
stat:
path: /etc/yum/pluginconf.d/fastestmirror.conf
@@ -73,5 +64,3 @@
name: "{{ ( (ansible_distribution_major_version | int) < 8) | ternary('libselinux-python','python3-libselinux') }}"
state: present
become: true
when:
- not is_atomic

View File

@@ -1,21 +1,6 @@
---
# Some Fedora based distros ship without Python installed
- name: Check if this is an atomic host
raw: stat /run/ostree-booted
register: ostree
environment: {}
failed_when: false
changed_when: false
tags:
- facts
- name: Store the fact if this is an atomic host
set_fact:
is_atomic: "{{ ostree.rc == 0 }}"
tags:
- facts
- name: Check if bootstrap is needed
raw: which python
register: need_bootstrap
@@ -43,7 +28,6 @@
when:
- http_proxy is defined
- need_http_proxy.rc != 0
- not is_atomic
# Fedora's policy as of Fedora 30 is to still install python2 as /usr/bin/python
# See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 for the current status
@@ -53,7 +37,6 @@
environment: {}
when:
- need_bootstrap.rc != 0
- not is_atomic
# libselinux-python is required on SELinux enabled hosts
# See https://docs.ansible.com/ansible/latest/installation_guide/intro_installation.html#managed-node-requirements
@@ -62,5 +45,3 @@
name: libselinux-python
state: present
become: true
when:
- not is_atomic