diff --git a/roles/ceph-common/tasks/installs/redhat_community_repository.yml b/roles/ceph-common/tasks/installs/redhat_community_repository.yml index 5fd817d75..a5bea1c64 100644 --- a/roles/ceph-common/tasks/installs/redhat_community_repository.yml +++ b/roles/ceph-common/tasks/installs/redhat_community_repository.yml @@ -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 rpm_key: key: "{{ ceph_stable_key }}" diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index 256173743..01137bfe9 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -78,7 +78,7 @@ debian_package_dependencies: [] centos_package_dependencies: - epel-release - - "{{ 'python3-libselinux' if ansible_distribution_major_version | int >= 8 else 'libselinux-python' }}" + - python3-libselinux redhat_package_dependencies: [] diff --git a/roles/ceph-facts/tasks/container_binary.yml b/roles/ceph-facts/tasks/container_binary.yml index 8e866bcbf..fcaf84474 100644 --- a/roles/ceph-facts/tasks/container_binary.yml +++ b/roles/ceph-facts/tasks/container_binary.yml @@ -6,4 +6,4 @@ - name: set_fact container_binary 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' }}" \ No newline at end of file + container_binary: "{{ 'podman' if (podman_binary.stat.exists and ansible_distribution == 'Fedora') or (ansible_os_family == 'RedHat') else 'docker' }}" \ No newline at end of file diff --git a/roles/ceph-mgr/tasks/pre_requisite.yml b/roles/ceph-mgr/tasks/pre_requisite.yml index 76102e22f..eff558b10 100644 --- a/roles/ceph-mgr/tasks/pre_requisite.yml +++ b/roles/ceph-mgr/tasks/pre_requisite.yml @@ -1,7 +1,7 @@ --- - name: set_fact ceph_mgr_packages for sso 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: - dashboard_enabled | bool - ansible_distribution == 'RedHat' @@ -11,12 +11,9 @@ ceph_mgr_packages: "{{ ceph_mgr_packages | union(['ceph-mgr-dashboard']) }}" when: dashboard_enabled | bool -- name: set_fact ceph_mgr_packages for non el7 distribution +- name: set_fact ceph_mgr_packages set_fact: 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 package: diff --git a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml index f739b32d7..9e040ed62 100644 --- a/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml +++ b/roles/ceph-nfs/tasks/ganesha_selinux_fix.yml @@ -9,21 +9,12 @@ - name: if selinux is not disable when: selinuxstatus.stdout != 'Disabled' 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 package: name: ['nfs-ganesha-selinux', 'python3-policycoreutils'] state: present register: result until: result is succeeded - when: ansible_distribution_major_version == '8' - name: add ganesha_t to permissive domain selinux_permissive: diff --git a/site-container.yml.sample b/site-container.yml.sample index ed2595ee1..b98000819 100644 --- a/site-container.yml.sample +++ b/site-container.yml.sample @@ -441,7 +441,7 @@ - name: set_fact container_binary 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 command: > diff --git a/tests/functional/setup.yml b/tests/functional/setup.yml index 67bc40a77..41052f0c1 100644 --- a/tests/functional/setup.yml +++ b/tests/functional/setup.yml @@ -22,7 +22,7 @@ mount: path: '{{ rootmount.mount }}' 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 }}' state: mounted @@ -36,37 +36,6 @@ until: result is succeeded 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 lvol: lv: root