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

Merge pull request #947 from font/cephconf 

Restrict fact gathering to mons and update ceph.conf
pull/954/head
Leseb 2016-08-23 12:01:16 +02:00 committed by GitHub
parent a22fa9abe3 ef4d0a39f2
commit 96f7f8b74e
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,19 +32,19 @@ mon host = {% for host in groups[mon_group_name] %}{{ hostvars[host]['ansible_'
{% if mon_containerized_deployment %}
fsid = {{ fsid }}
{% if groups[mon_group_name] is defined %}
{% for host in groups[mon_group_name] %}
mon host = {% for host in groups[mon_group_name] -%}
{% if mon_containerized_deployment %}
{% set interface = ["ansible_",ceph_mon_docker_interface]|join %}
mon_host = {{ hostvars[host][interface]['ipv4']['address'] }}
{% if not loop.last %},{% endif %}
{{ hostvars[host][interface]['ipv4']['address'] }}
{%- if not loop.last %},{% endif %}
{% elif hostvars[host]['monitor_address'] is defined %}
mon_host = {{ hostvars[host]['monitor_address'] }}
{% if not loop.last %},{% endif %}
{{ hostvars[host]['monitor_address'] }}
{%- if not loop.last %},{% endif %}
{% elif monitor_address != "0.0.0.0" %}
mon_host = monitor_address
{% if not loop.last %},{% endif %}
monitor_address
{%- if not loop.last %},{% endif %}
{% endif %}
{% endfor %}
{%- endfor %}
{% endif %}
{% endif %}

3
site-docker.yml.sample
View File

@ -1,11 +1,12 @@
---
# Defines deployment design and assigns role to server groups
- hosts: all
- hosts: mons # gather mon facts first before we process ceph-mon serially
tasks: []
- hosts: mons
become: True
gather_facts: false
roles:
- ceph-mon
serial: 1 # MUST be '1' WHEN DEPLOYING MONITORS ON DOCKER CONTAINERS