]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-cookbooks.git/commitdiff
Enables cephx if ceph.config.global exists 150/head
authorWalter Huf <walter.huf@corvisa.com>
Tue, 16 Sep 2014 19:54:46 +0000 (14:54 -0500)
committerWalter Huf <walter.huf@corvisa.com>
Tue, 16 Sep 2014 19:54:46 +0000 (14:54 -0500)
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.

libraries/default.rb

index acb78c7865f4f4bb200bcb591579c048832c96a7..ce15d6ded4fa10ced6a1e0a66586e7887d75d6e2 100644 (file)
@@ -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