From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Fri, 10 Feb 2017 09:04:54 +0000 (+0100)
Subject: Skip facts_mon_fsid.yml if cephx is disabled
X-Git-Tag: v2.2.0rc1~31^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1304%2Fhead;p=ceph-ansible.git

Skip facts_mon_fsid.yml if cephx is disabled

If cephx is disabled it is not necessary to include `facts_mon_fsid.yml`
in `roles/ceph-common/tasks/facts.yml`.

Fix: #1300
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/roles/ceph-common/tasks/facts.yml b/roles/ceph-common/tasks/facts.yml
index 9709e3819..6a05cc097 100644
--- a/roles/ceph-common/tasks/facts.yml
+++ b/roles/ceph-common/tasks/facts.yml
@@ -42,6 +42,7 @@
 - include: facts_mon_fsid.yml
   run_once: true
   when:
+    - cephx
     - not monitor_keyring_conf.stat.exists
     - ceph_current_fsid.rc == 0
     - mon_group_name in group_names