From 336ba2a9a3df159c66383539e94c68c32cdc23de Mon Sep 17 00:00:00 2001
From: Paul Collins <paul.collins@canonical.com>
Date: Thu, 18 Oct 2012 19:19:52 +1300
Subject: [PATCH] add auth-supported config option

---
 config.yaml         | 9 +++++++++
 hooks/hooks.py      | 1 +
 templates/ceph.conf | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/config.yaml b/config.yaml
index bdc1520..dd5ce65 100644
--- a/config.yaml
+++ b/config.yaml
@@ -6,6 +6,15 @@ options:
       .
       This configuration element is mandatory and the service will fail on
       install if it is not provided.
+  auth-supported:
+    type: string
+    default: cephx
+    description: |
+      Which authentication flavour to use.
+      .
+      Valid options are "cephx" and "none".  If "none" is specified,
+      keys will still be created and deployed so that it can be
+      enabled later.
   monitor-secret:
     type: string
     description: |
diff --git a/hooks/hooks.py b/hooks/hooks.py
index 570af21..6930490 100755
--- a/hooks/hooks.py
+++ b/hooks/hooks.py
@@ -33,6 +33,7 @@ def install():
 
 def emit_cephconf():
     cephcontext = {
+        'auth_supported': utils.config_get('auth-supported'),
         'mon_hosts': ' '.join(get_mon_hosts()),
         'fsid': utils.config_get('fsid'),
         }
diff --git a/templates/ceph.conf b/templates/ceph.conf
index 072535f..2af77d0 100644
--- a/templates/ceph.conf
+++ b/templates/ceph.conf
@@ -1,5 +1,5 @@
 [global]
- auth supported = cephx
+ auth supported = {{ auth_supported }}
  keyring = /etc/ceph/$cluster.$name.keyring
  mon host = {{ mon_hosts }}
  fsid = {{ fsid }}