From: Sébastien Han <seb@redhat.com>
Date: Mon, 21 Jan 2019 12:53:53 +0000 (+0100)
Subject: Revert "mon: force peer addition"
X-Git-Tag: v4.0.0beta1~65
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41a7cc878c10e638ae5dc3107688e109ad494f76;p=ceph-ansible.git

Revert "mon: force peer addition"

This reverts commit ee08d1f89a588e878324141dd0f80c65058a377d which was
mostly to workaround a bug in ceph@master. Now, ceph@master is fixed so
reverting this. Thanks to https://github.com/ceph/ceph/pull/25900

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

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index e8d9fd518..3bc4f8f55 100644
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -1,18 +1,4 @@
 ---
-- name: wait for the monitor socket to exist
-  stat:
-    path: "/var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok"
-  register: socket
-  until: socket.stat.exists
-
-- name: add bootstrap peers for monitors to form quorum
-  command: "{{ docker_exec_cmd }} ceph --admin-daemon /var/run/ceph/{{ cluster }}-mon.{{ monitor_name }}.asok add_bootstrap_peer_hint {{ hostvars[item.1]['_current_monitor_address'] }}:{{ item.0 }}"
-  with_nested:
-    - 3300
-    - "{{ groups[mon_group_name] }}"
-  changed_when: false
-  failed_when: false
-
 - name: waiting for the monitor(s) to form the quorum...
   command: >
     {{ docker_exec_cmd }}