From: Sébastien Han <seb@redhat.com>
Date: Mon, 18 Sep 2017 21:56:38 +0000 (+0200)
Subject: common: fix rhcs installation and rgw package for nfs
X-Git-Tag: v3.0.0rc10~2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1918%2Fhead;p=ceph-ansible.git

common: fix rhcs installation and rgw package for nfs

RHCS install wasn't working at all prior to this commit as the name of
the include was pointing to a non-existing file.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1492056
Signed-off-by: Sébastien Han <seb@redhat.com>
---

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 5a8932137..1b22afda4 100644
--- a/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
+++ b/roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
@@ -35,14 +35,14 @@
   shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-{{ ceph_rhcs_version }}-tools-rpms
   changed_when: false
   failed_when: false
-  register: rhcs_rgw_mds_repo
+  register: rhcs_rgw_mds_nfs_repo
   always_run: true
   when:
-    - (rgw_group_name in group_names or mds_group_name in group_names)
+    - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names)
 
 - 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 or mds_group_name in group_names)
-    - rhcs_rgw_mds_repo.rc != 0
+    - (rgw_group_name in group_names or mds_group_name in group_names or nfs_group_name in group_names)
+    - rhcs_rgw_mds_nfs_repo.rc != 0
diff --git a/roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml b/roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml
deleted file mode 100644
index 3fdac2b05..000000000
--- a/roles/ceph-common/tasks/installs/redhat_enterprise_repository.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-- name: include prerequisite_rhcs_iso_install.yml
-  include: prerequisite_rhcs_iso_install.yml
-  when:
-    - ceph_repository_type == 'iso'
-
-- name: include prerequisite_rhcs_cdn_install.yml
-  include: prerequisite_rhcs_cdn_install.yml
-  when:
-    - ceph_repository_type == 'cdn'
diff --git a/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
new file mode 100644
index 000000000..3fdac2b05
--- /dev/null
+++ b/roles/ceph-common/tasks/installs/redhat_rhcs_repository.yml
@@ -0,0 +1,10 @@
+---
+- name: include prerequisite_rhcs_iso_install.yml
+  include: prerequisite_rhcs_iso_install.yml
+  when:
+    - ceph_repository_type == 'iso'
+
+- name: include prerequisite_rhcs_cdn_install.yml
+  include: prerequisite_rhcs_cdn_install.yml
+  when:
+    - ceph_repository_type == 'cdn'