From adaa914d8e75586a2cd2442e750441fc23e957c4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Tue, 30 Oct 2018 16:45:07 +0100 Subject: [PATCH] ceph-common: use yum install of shell MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use yum module to list repos and then activate them if needed. Signed-off-by: Sébastien Han --- .../prerequisite_rhcs_cdn_install.yml | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml index 04461a4d1..471aa7260 100644 --- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml +++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml @@ -1,10 +1,9 @@ --- - name: check if the red hat storage monitor repo is already present - shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms - changed_when: false - failed_when: false + yum: + list: repos + update_cache: no register: rhcs_mon_repo - check_mode: no when: - (mon_group_name in group_names or mgr_group_name in group_names) @@ -13,12 +12,12 @@ changed_when: false when: - (mon_group_name in group_names or mgr_group_name in group_names) - - rhcs_mon_repo.rc != 0 + - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-mon-rpms' not in rhcs_mon_repo.results" - name: check if the red hat storage osd repo is already present - shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-osd-rpms - changed_when: false - failed_when: false + yum: + list: repos + update_cache: no register: rhcs_osd_repo check_mode: no when: @@ -29,12 +28,12 @@ changed_when: false when: - osd_group_name in group_names - - rhcs_osd_repo.rc != 0 + - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-osd-rpms' not in rhcs_osd_repo.results" - name: check if the red hat storage tools repo is already present - shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms - changed_when: false - failed_when: false + yum: + list: repos + update_cache: no register: rhcs_tools_repo check_mode: no when: @@ -45,4 +44,4 @@ changed_when: false when: - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names or iscsi_gw_group_name in group_names or client_group_name in group_names) - - rhcs_tools_repo.rc != 0 + - "'rhel-7-server-rhceph-'+ ceph_rhcs_version | string +'-tools-rpms' not in rhcs_tools_repo.results" \ No newline at end of file -- 2.39.5