drop centos7 support

DNM/WIP

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
guits-refact_container_binary
Guillaume Abrioux 2020-07-03 10:57:55 +02:00
parent 93754bd70c
commit baa3857b2a
7 changed files with 6 additions and 57 deletions

View File

@ -1,12 +1,4 @@
--- ---
- name: install yum plugin priorities
package:
name: yum-plugin-priorities
register: result
until: result is succeeded
tags: with_pkg
when: ansible_distribution_major_version | int == 7
- name: configure red hat ceph community repository stable key - name: configure red hat ceph community repository stable key
rpm_key: rpm_key:
key: "{{ ceph_stable_key }}" key: "{{ ceph_stable_key }}"

View File

@ -78,7 +78,7 @@ debian_package_dependencies: []
centos_package_dependencies: centos_package_dependencies:
- epel-release - epel-release
- "{{ 'python3-libselinux' if ansible_distribution_major_version | int >= 8 else 'libselinux-python' }}" - python3-libselinux
redhat_package_dependencies: [] redhat_package_dependencies: []

View File

@ -6,4 +6,4 @@
- name: set_fact container_binary - name: set_fact container_binary
set_fact: set_fact:
container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8') else 'docker' }}" container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat') else 'docker' }}"

View File

@ -1,7 +1,7 @@
--- ---
- name: set_fact ceph_mgr_packages for sso - name: set_fact ceph_mgr_packages for sso
set_fact: set_fact:
ceph_mgr_packages: "{{ ceph_mgr_packages | union(['python3-saml' if ansible_distribution_major_version | int == 8 else 'python-saml']) }}" ceph_mgr_packages: "{{ ceph_mgr_packages | union(['python3-saml']) }}"
when: when:
- dashboard_enabled | bool - dashboard_enabled | bool
- ansible_distribution == 'RedHat' - ansible_distribution == 'RedHat'
@ -11,12 +11,9 @@
ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-dashboard']) }}" ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-dashboard']) }}"
when: dashboard_enabled | bool when: dashboard_enabled | bool
- name: set_fact ceph_mgr_packages for non el7 distribution - name: set_fact ceph_mgr_packages
set_fact: set_fact:
ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-diskprediction-local']) }}" ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-diskprediction-local']) }}"
when:
- ansible_os_family != 'RedHat'
- ansible_distribution_major_version | int != 7
- name: install ceph-mgr packages on RedHat or SUSE - name: install ceph-mgr packages on RedHat or SUSE
package: package:

View File

@ -9,21 +9,12 @@
- name: if selinux is not disable - name: if selinux is not disable
when: selinuxstatus.stdout != 'Disabled' when: selinuxstatus.stdout != 'Disabled'
block: block:
- name: install policycoreutils-python
package:
name: policycoreutils-python
state: present
register: result
until: result is succeeded
when: ansible_distribution_major_version == '7'
- name: install nfs-ganesha-selinux and python3-policycoreutils on RHEL 8 - name: install nfs-ganesha-selinux and python3-policycoreutils on RHEL 8
package: package:
name: ['nfs-ganesha-selinux', 'python3-policycoreutils'] name: ['nfs-ganesha-selinux', 'python3-policycoreutils']
state: present state: present
register: result register: result
until: result is succeeded until: result is succeeded
when: ansible_distribution_major_version == '8'
- name: add ganesha_t to permissive domain - name: add ganesha_t to permissive domain
selinux_permissive: selinux_permissive:

View File

@ -441,7 +441,7 @@
- name: set_fact container_binary - name: set_fact container_binary
set_fact: set_fact:
container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat' and ansible_distribution_major_version == '8') else 'docker' }}" container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat') else 'docker' }}"
- name: get ceph status from the first monitor - name: get ceph status from the first monitor
command: > command: >

View File

@ -22,7 +22,7 @@
mount: mount:
path: '{{ rootmount.mount }}' path: '{{ rootmount.mount }}'
src: '{{ rootmount.device }}' src: '{{ rootmount.device }}'
opts: 'noatime,nodiratime{% if ansible_os_family == "RedHat" and ansible_distribution_major_version | int < 8 %},nobarrier{% endif %}' opts: 'noatime,nodiratime'
fstype: '{{ rootmount.fstype }}' fstype: '{{ rootmount.fstype }}'
state: mounted state: mounted
@ -36,37 +36,6 @@
until: result is succeeded until: result is succeeded
when: not is_atomic | bool when: not is_atomic | bool
- name: centos based systems - configure repos
block:
- name: disable fastest mirror detection
ini_file:
path: /etc/yum/pluginconf.d/fastestmirror.conf
section: main
option: enabled
value: 0
- name: install epel
package:
name: epel-release
state: present
register: result
until: result is succeeded
- name: enable local epel repository
ini_file:
path: /etc/yum.repos.d/epel.repo
section: epel
option: baseurl
value: http://apt-mirror.front.sepia.ceph.com/epel7/
- name: disable remote epel repository
ini_file:
path: /etc/yum.repos.d/epel.repo
section: epel
option: metalink
state: absent
when:
- ansible_distribution == 'CentOS'
- ansible_distribution_major_version | int == 7
- not is_atomic | bool
- name: resize logical volume for root partition to fill remaining free space - name: resize logical volume for root partition to fill remaining free space
lvol: lvol:
lv: root lv: root