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

common: only add a daemon section if we run on the host 

We don't want to have heterogeous ceph.conf anymore and believe that we
should have the right section for the running daemon.
If we don't do this and use profiles, e.g: rgw, we will get a new rgw
section on some of the nodes.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/1018/head
Sébastien Han 2017-07-27 15:50:38 +02:00
parent 233696d1b1
commit 26f4752bc4
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,6 +112,7 @@ filestore xattr use omap = true
{% endif %} {% endif %}
{% if groups[mds_group_name] is defined %} {% if groups[mds_group_name] is defined %}
{% if mds_group_name in group_names %}
{% for host in groups[mds_group_name] %} {% for host in groups[mds_group_name] %}
{% if hostvars[host]['ansible_fqdn'] is defined and mds_use_fqdn %} {% if hostvars[host]['ansible_fqdn'] is defined and mds_use_fqdn %}
[mds.{{ hostvars[host]['ansible_fqdn'] }}] [mds.{{ hostvars[host]['ansible_fqdn'] }}]
@ -122,8 +123,10 @@ host = {{ hostvars[host]['ansible_hostname'] }}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
{% if groups[rgw_group_name] is defined %} {% if groups[rgw_group_name] is defined %}
{% if rgw_group_name in group_names %}
{% 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'] }}]
@ -136,8 +139,10 @@ rgw frontends = civetweb port={{ radosgw_civetweb_bind_ip }}:{{ radosgw_civetweb
{% endif %} {% endif %}
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endif %}
{% if groups[restapi_group_name] is defined %} {% if groups[restapi_group_name] is defined %}
{% if restapi_group_name in group_names %}
[client.restapi] [client.restapi]
{% if restapi_interface != "interface" %} {% if restapi_interface != "interface" %}
{% include 'client_restapi_interface.j2' %} {% include 'client_restapi_interface.j2' %}
@ -147,3 +152,4 @@ rgw frontends = civetweb port={{ radosgw_civetweb_bind_ip }}:{{ radosgw_civetweb
keyring = /var/lib/ceph/restapi/ceph-restapi/keyring keyring = /var/lib/ceph/restapi/ceph-restapi/keyring
log file = /var/log/ceph/ceph-restapi.log log file = /var/log/ceph/ceph-restapi.log
{% endif %} {% endif %}
{% endif %}