ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/318/head
leseb 2015-07-06 17:36:45 +02:00
parent 070b790af0
commit ed3a7136da
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-common/tasks/prerequisite_rh_storage_cdn_install.yml
View File

@ -18,7 +18,7 @@
rh_storage_mon_repo.rc != 0 rh_storage_mon_repo.rc != 0
- name: check if the red hat storage osd repo is already present - 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 changed_when: false
register: rh_storage_osd_repo register: rh_storage_osd_repo
when: osd_group_name in group_names when: osd_group_name in group_names
@ -31,7 +31,7 @@
rh_storage_osd_repo.rc != 0 rh_storage_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 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 changed_when: false
register: rh_storage_rgw_repo register: rh_storage_rgw_repo
when: rgw_group_name in group_names when: rgw_group_name in group_names

2
roles/ceph-common/templates/ceph.conf.j2
View File

@ -142,7 +142,7 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% if groups[mds_group_name] is defined %} {% if groups[rgw_group_name] is defined %}
{% for host in groups[rgw_group_name] %} {% for host in groups[rgw_group_name] %}
{% if hostvars[host]['ansible_hostname'] is defined %} {% if hostvars[host]['ansible_hostname'] is defined %}
[client.rgw.{{ hostvars[host]['ansible_hostname'] }}] [client.rgw.{{ hostvars[host]['ansible_hostname'] }}]