From: Kyle Squizzato <ksquizz@gmail.com>
Date: Thu, 31 Mar 2016 19:23:12 +0000 (-0400)
Subject: Added when: cephx to prevent waiting on keyring with cephx: false
X-Git-Tag: v1.0.4~25^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9d10db21c218570d4e54ad242b2f4284b08f4d10;p=ceph-ansible.git

Added when: cephx to prevent waiting on keyring with cephx: false

Signed-off-by: Kyle Squizzato <ksquizz@gmail.com>
---

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 5b81586e2..c6df4f4ae 100644
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -4,6 +4,7 @@
 - name: wait for client.admin key exists
   wait_for:
     path: /etc/ceph/{{ cluster }}.client.admin.keyring
+  when: cephx
 
 - name: create ceph rest api keyring when mon is not containerized
   command: ceph --cluster {{ cluster }} auth get-or-create client.restapi osd 'allow *' mon 'allow *' -o /etc/ceph/{{ cluster }}.client.restapi.keyring