add auth-supported config option

This commit is contained in:
Paul Collins 2012-10-18 19:19:52 +13:00
parent 7bcd20d783
commit 336ba2a9a3
3 changed files with 11 additions and 1 deletions

View File

@ -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: |

View File

@ -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'),
}

View File

@ -1,5 +1,5 @@
[global]
auth supported = cephx
auth supported = {{ auth_supported }}
keyring = /etc/ceph/$cluster.$name.keyring
mon host = {{ mon_hosts }}
fsid = {{ fsid }}