Restrict fact gathering to mons and update ceph.conf

- Gather facts only for mons before processing ceph-mon role serially in
  containerized playbook sample
- Updated ceph.conf in order to generate a valid ceph.conf

Signed-off-by: Ivan Font <ivan.font@redhat.com>
pull/947/head
Ivan Font 2016-08-22 10:42:27 -07:00
parent 6e0dfcd6f9
commit ef4d0a39f2
2 changed files with 10 additions and 9 deletions

View File

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

View File

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