From: Dimitri Savineau <dsavinea@redhat.com>
Date: Wed, 3 Feb 2021 15:28:24 +0000 (-0500)
Subject: ceph-common: enable rhcs tools repo for monitoring
X-Git-Tag: v4.0.50~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=735965ef9cbe003520bbbe0dae5acc664ec869f6;p=ceph-ansible.git

ceph-common: enable rhcs tools repo for monitoring

The monitoring node running grafana needs the rhcs tools repostory
enabled in non containerized deployment to be able to install the
ceph-grafana-dashboards rpm package.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1918650

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

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 e3e550b07..51835a956 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -15,7 +15,7 @@
     - name: enable red hat storage tools repository
       rhsm_repository:
         name: "rhceph-{{ ceph_rhcs_version }}-tools-for-rhel-8-{{ ansible_architecture }}-rpms"
-      when: (mgr_group_name in group_names or 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)
+      when: (mgr_group_name in group_names or 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 or monitoring_group_name in group_names)
 
 - name: "rhcs {{ ceph_rhcs_version }} on rhel 7"
   when: ansible_distribution_major_version | int == 7
@@ -33,4 +33,4 @@
     - name: enable red hat storage tools repository
       rhsm_repository:
         name: "rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms"
-      when: (mgr_group_name in group_names or 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)
+      when: (mgr_group_name in group_names or 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 or monitoring_group_name in group_names)