Fix a terrible mistake in the ceph.conf template

Feel so bad about this one...
Now it's fixed, the rgw section will be activated once the rgws hosts
are part of the inventory.

Signed-off-by: leseb <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml b/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
index 62c1cc3ab4732319019b157f4c4d89ac374bf2d0..ac7278c87e005f2926a571004ba64cae05f340ae 100644 (file)
--- a/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
+++ b/roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
@@ -18,7 +18,7 @@
     rh_storage_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-1.3-mon-rpms
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-osd-rpms
   changed_when: false
   register: rh_storage_osd_repo
   when: osd_group_name in group_names
@@ -31,7 +31,7 @@
     rh_storage_osd_repo.rc != 0
 
 - name: check if the red hat storage rados gateway repo is already present
-  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-mon-rpms
+  shell: yum --noplugins --cacheonly repolist | grep -sq rhel-7-server-rhceph-1.3-tools-rpms
   changed_when: false
   register: rh_storage_rgw_repo
   when: rgw_group_name in group_names

diff --git a/roles/ceph-common/templates/ceph.conf.j2 b/roles/ceph-common/templates/ceph.conf.j2
index 469946259a7f3da3f0ec2b18bbdf19795ec3fccd..acfcb0ef48bec47ff525a34eee51b45f3291d382 100644 (file)
--- a/roles/ceph-common/templates/ceph.conf.j2
+++ b/roles/ceph-common/templates/ceph.conf.j2
@@ -142,7 +142,7 @@
 {% endfor %}
 {% endif %}
 
-{% if groups[mds_group_name] is defined %}
+{% if groups[rgw_group_name] is defined %}
 {% for host in groups[rgw_group_name] %}
 {% if hostvars[host]['ansible_hostname'] is defined %}
 [client.rgw.{{ hostvars[host]['ansible_hostname'] }}]