From: Walter  Huf <walter.huf@corvisa.com>
Date: Tue, 16 Sep 2014 19:54:46 +0000 (-0500)
Subject: Enables cephx if ceph.config.global exists
X-Git-Tag: v0.8.0~21^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8dbb54ff414f629b172c76bac34b22a4aeeabb7b;p=ceph-cookbooks.git

Enables cephx if ceph.config.global exists

If you have a ceph.config.global setting, but didn't have a setting
'auth cluster required', the recipe wouldn't try to use cephx.
---

diff --git a/libraries/default.rb b/libraries/default.rb
index acb78c7..ce15d6d 100644
--- a/libraries/default.rb
+++ b/libraries/default.rb
@@ -178,5 +178,6 @@ def use_cephx?(type = nil)
   # CephX is enabled if it's not configured at all, or explicity enabled
   node['ceph']['config'].nil? ||
     node['ceph']['config']['global'].nil? ||
+    node['ceph']['config']['global']["auth #{type} required"].nil? ||
     node['ceph']['config']['global']["auth #{type} required"] == 'cephx'
 end