From: Vasu Kulkarni <vasu@redhat.com>
Date: Tue, 26 Jun 2018 21:41:14 +0000 (-0700)
Subject: Enable monitor repo for mgr nodes and Tools repo for iscsi/nfs/clients
X-Git-Tag: v3.1.0rc10~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6431976e222b583b3e43397611523170f50478f0;p=ceph-ansible.git

Enable monitor repo for mgr nodes and Tools repo for iscsi/nfs/clients

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
(cherry picked from commit 1d454b611f9ec5403a474fcb45a6333ca6d36715)
---

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 378bb4e7d..fab01d99b 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -12,7 +12,7 @@
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
   changed_when: false
   when:
-    - mon_group_name in group_names
+    - (mon_group_name in group_names or mgr_group_name in group_names)
     - rhcs_mon_repo.rc != 0
 
 - name: check if the red hat storage osd repo is already present
diff --git a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
index 9208eca60..c8f00f806 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install_debian.yml
@@ -11,7 +11,7 @@
     update_cache: no
   register: add_debian_apt_repo
   with_items:
-    - { repo: "MON", configure: (mon_group_name in group_names) }
+    - { repo: "MON", configure: (mon_group_name in group_names or mgr_group_name in group_names) }
     - { repo: "OSD", configure: (osd_group_name in group_names) }
-    - { repo: "Tools", configure: (rgw_group_name in group_names or mds_group_name in group_names) }
+    - { repo: "Tools", configure: (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: item.configure