From ed3a7136da7687220b1676167a32782b738a932d Mon Sep 17 00:00:00 2001 From: leseb Date: Mon, 6 Jul 2015 17:36:45 +0200 Subject: [PATCH] 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 --- .../ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml | 4 ++-- roles/ceph-common/templates/ceph.conf.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 62c1cc3ab..ac7278c87 100644 --- 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 469946259..acfcb0ef4 100644 --- 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'] }}]