From: Sébastien Han <seb@redhat.com>
Date: Thu, 2 Feb 2017 21:52:24 +0000 (+0100)
Subject: docker: fix monitor addition on kraken
X-Git-Tag: v2.1.7~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6541e39e28cf61a55df16218512a5f67de45fae;p=ceph-ansible.git

docker: fix monitor addition on kraken

Probably not the best fix but useful for testing. We will remove this
once we find a better workaround.

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 62d111750..e93ed509f 100644
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -62,13 +62,21 @@
 
 - include: start_docker_monitor.yml
 
-# NOTE: if we don't wait we will attempt to copy config to ansible host
-# before admin key is ready, preventing future daemons e.g. ceph-mds from
-# properly retrieving key
-- name: "wait for {{ cluster }}.client.admin.keyring exists"
-  wait_for:
-    path: /etc/ceph/{{ cluster }}.client.admin.keyring
-  when: cephx
+- name: wait for monitor socket to exist
+  command: docker exec {{ ansible_hostname }} stat /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok
+  register: monitor_socket
+  retries: 5
+  delay: 10
+  until: monitor_socket.rc == 0
+
+- name: force peer addition as potential bootstrap peer for cluster bringup
+  command: docker exec {{ ansible_hostname }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ ansible_hostname }}.asok add_bootstrap_peer_hint {{ hostvars[item]['ansible_' + ceph_mon_docker_interface].ipv4.address }}
+  with_items: "{{ groups.mons }}"
+  changed_when: false
+  failed_when: false
+  when:
+    - inventory_hostname == groups.mons[0]
+    - not mon_containerized_deployment_with_kv
 
 - include: copy_configs.yml
   when: not mon_containerized_deployment_with_kv