Merge pull request #1219 from ceph/rhcs-mds-repo-2.1

common: enable tool repo for mds install of rhcs

roles/ceph-common/tasks/main.yml

@@ -17,7 +17,7 @@
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./pre_requisites/prerequisite_rh_storage_iso_install.yml
+- include: ./pre_requisites/prerequisite_rhcs_iso_install.yml
   when:
     - ceph_rhcs
     - ceph_rhcs_iso_install
@@ -26,7 +26,7 @@
   # Hard code this so we will skip the entire file instead of individual tasks (Default isn't Consistent)
   static: False
 
-- include: ./pre_requisites/prerequisite_rh_storage_cdn_install.yml
+- include: ./pre_requisites/prerequisite_rhcs_cdn_install.yml
   when:
     - ceph_rhcs
     - ceph_rhcs_cdn_install

roles/ceph-common/tasks/pre_requisites/prerequisite_rhcs_cdn_install.yml

@@ -9,7 +9,7 @@
   shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-mon-rpms
   changed_when: false
   failed_when: false
-  register: rh_storage_mon_repo
+  register: rhcs_mon_repo
   always_run: true
   when: mon_group_name in group_names
 
@@ -18,13 +18,13 @@
   changed_when: false
   when:
     - mon_group_name in group_names
-    - rh_storage_mon_repo.rc != 0
+    - rhcs_mon_repo.rc != 0
 
 - 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
-  register: rh_storage_osd_repo
+  register: rhcs_osd_repo
   always_run: true
   when: osd_group_name in group_names
 
@@ -33,19 +33,19 @@
   changed_when: false
   when:
     - osd_group_name in group_names
-    - rh_storage_osd_repo.rc != 0
+    - rhcs_osd_repo.rc != 0
 
-- name: check if the red hat storage rados gateway repo is already present
+- name: check if the red hat storage rados gateway / mds 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
-  register: rh_storage_rgw_repo
+  register: rhcs_rgw_mds_repo
   always_run: true
-  when: rgw_group_name in group_names
+  when: (rgw_group_name in group_names or mds_group_name in group_names)
 
-- name: enable red hat storage rados gateway repository
+- name: enable red hat storage rados gateway / mds repository
   command: subscription-manager repos --enable rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
   changed_when: false
   when:
-    - rgw_group_name in group_names
-    - rh_storage_rgw_repo.rc != 0
+    - (rgw_group_name in group_names or mds_group_name in group_names)
+    - rhcs_rgw_mds_repo.rc != 0