[pve-devel] [PATCH 3/3] ceph init : add optionnal disable-cephx option

Alexandre Derumier aderumier at odiso.com
Fri Apr 28 09:52:59 CEST 2017


Signed-off-by: Alexandre Derumier <aderumier at odiso.com>
---
 PVE/API2/Ceph.pm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
index cf675ac9..6047ef30 100644
--- a/PVE/API2/Ceph.pm
+++ b/PVE/API2/Ceph.pm
@@ -733,6 +733,12 @@ __PACKAGE__->register_method ({
 		minimum => 6,
 		maximum => 14,
 	    },
+	    'disable-cephx' => {
+		description => "Disable cephx authentification.",
+		type => 'boolean',
+		optional => 1,
+		default => 0,
+	    }
 	},
     },
     returns => { type => 'null' },
@@ -752,11 +758,13 @@ __PACKAGE__->register_method ({
 	    UUID::generate($uuid);
 	    UUID::unparse($uuid, $fsid);
 
+	    my $auth = $param->{'disable-cephx'} ? 'none' : 'cephx';
+
 	    $cfg->{global} = {
 		'fsid' => $fsid,
-		'auth cluster required' => 'cephx',
-		'auth service required' => 'cephx',
-		'auth client required' => 'cephx',
+		'auth cluster required' => $auth,
+		'auth service required' => $auth,
+		'auth client required' => $auth,
 		'osd journal size' => $pve_osd_default_journal_size,
 		'osd pool default min size' => 1,
 		'debug asok' => '0/0',
-- 
2.11.0




More information about the pve-devel mailing list