From: Cornelius Keller <cornelius.keller@gmail.com>
Date: Fri, 7 Nov 2014 14:32:49 +0000 (+0100)
Subject: making vagrant up work
X-Git-Tag: v1.0.0~315^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=497d987fa9db614c5301d294c085470a0038e9d6;p=ceph-ansible.git

making vagrant up work
---

diff --git a/group_vars/all b/group_vars/all
index b5d2708bb..bac661c30 100644
--- a/group_vars/all
+++ b/group_vars/all
@@ -16,7 +16,7 @@ dummy:
 
 ## Monitor options
 #
-#monitor_interface: eth1
+monitor_interface: eth1
 #mon_osd_down_out_interval: 600
 #mon_osd_min_down_reporters: 7 # number of OSDs per host + 1
 
diff --git a/roles/ceph-mon/tasks/main.yml b/roles/ceph-mon/tasks/main.yml
index f64c1ef9d..12fad8a0e 100644
--- a/roles/ceph-mon/tasks/main.yml
+++ b/roles/ceph-mon/tasks/main.yml
@@ -3,11 +3,14 @@
 
 # Wait for mon discovery and quorum resolution
 # the admin key is not instantanely created so we have to wait a bit
-- name: If client.admin key exists
-  command: stat /etc/ceph/ceph.client.admin.keyring
-  register: result
-  until: result.rc == 0
-  changed_when: False
+#- name: If client.admin key exists
+#  command: stat /etc/ceph/ceph.client.admin.keyring
+#  register: result
+#  until: result.rc == 0
+#  changed_when: False
+
+- name: wait for client.admin key exists
+  wait_for: path=/etc/ceph/ceph.client.admin.keyring
 
 - name: Create RGW keyring
   command: ceph auth get-or-create client.radosgw.gateway osd 'allow rwx' mon 'allow rw' -o /etc/ceph/keyring.radosgw.gateway creates=/etc/ceph/keyring.radosgw.gateway