From: Dimitri Savineau Date: Thu, 9 Apr 2020 18:00:52 +0000 (-0400) Subject: ceph-validate: update RHEL requirement for RHCS X-Git-Tag: v3.2.41~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=65b0e9bb5db52d2a0279069e6f2fded31180e3fc;p=ceph-ansible.git 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) --- diff --git a/roles/ceph-validate/tasks/check_system.yml b/roles/ceph-validate/tasks/check_system.yml index 4e50c7d7a..d5380e497 100644 --- a/roles/ceph-validate/tasks/check_system.yml +++ b/roles/ceph-validate/tasks/check_system.yml @@ -19,11 +19,11 @@ - 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" + msg: "Distribution not supported {{ ansible_distribution_version }} by Red Hat Ceph Storage, only RHEL 7 (>= 7.6)" when: - - ansible_distribution == 'Red Hat Enterprise Linux' + - ansible_distribution == 'RedHat' - ceph_repository == 'rhcs' - - ansible_distribution_version is version_compare('7.3', '<') + - ansible_distribution_version is version_compare('7.6', '<') - name: determine if node is registered with subscription-manager command: subscription-manager identity @@ -32,7 +32,7 @@ failed_when: false check_mode: no when: - - ansible_distribution == 'Red Hat Enterprise Linux' + - ansible_distribution == 'RedHat' - ceph_repository == 'rhcs' - ceph_repository_type == 'cdn' @@ -40,7 +40,7 @@ fail: msg: "You must register your machine with subscription-manager" when: - - ansible_distribution == 'Red Hat Enterprise Linux' + - ansible_distribution == 'RedHat' - ceph_repository == 'rhcs' - ceph_repository_type == 'cdn' - subscription.rc != '0'