]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
ceph-validate: update RHEL requirement for RHCS
authorDimitri Savineau <dsavinea@redhat.com>
Thu, 9 Apr 2020 18:00:52 +0000 (14:00 -0400)
committerDimitri Savineau <savineau.dimitri@gmail.com>
Tue, 14 Apr 2020 15:27:01 +0000 (11:27 -0400)
We were not testing the right ansible_distribution fact value for RHEL
distribution.
This commit also updates the minial RHEL version supported by RHCS.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit 5de74fe512575b2873b5863f5817f676954d3469)

roles/ceph-validate/tasks/check_system.yml

index f1a50fd3b2f30cdf905d96da6da16037f731f9cb..db3920b75b19ff2a5cc5b86331b3f5de34111f58 100644 (file)
 - name: red hat based systems tasks
   when:
     - ceph_repository == 'rhcs'
-    - ansible_distribution == 'Red Hat Enterprise Linux'
+    - ansible_distribution == 'RedHat'
   block:
     - name: fail on unsupported distribution for red hat ceph storage
       fail:
-        msg: "Distribution not supported {{ ansible_distribution_version }} by Red Hat Ceph Storage, only RHEL >= 7.3"
-      when: ansible_distribution_version | version_compare('7.3', '<')
+        msg: "Distribution not supported {{ ansible_distribution_version }} by Red Hat Ceph Storage, only RHEL 8 (>= 8.1) or RHEL 7 (>= 7.7)"
+      when: (ansible_distribution_major_version | int == 8 and ansible_distribution_version | version_compare('8.1', '<')) or
+            (ansible_distribution_major_version | int == 7 and ansible_distribution_version | version_compare('7.7', '<'))
 
     - name: subscription manager related tasks
       when: ceph_repository_type == 'cdn'