From 1033ad191bbd31de1fe68916bbe596db665f578a Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Thu, 9 Apr 2020 14:00:52 -0400 Subject: [PATCH] ceph-validate: update RHEL requirement for RHCS 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 (cherry picked from commit 5de74fe512575b2873b5863f5817f676954d3469) --- roles/ceph-validate/tasks/check_system.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml index f1a50fd3b..db3920b75 100644 --- a/roles/ceph-validate/tasks/check_system.yml +++ b/roles/ceph-validate/tasks/check_system.yml @@ -29,12 +29,13 @@ - 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'