[pve-devel] [PATCH manager 01/14] ceph: init: update inital config for nautilus

[Dominik Csapak]

since we do not support creating filestore osds anymore, drop
the journal size from the config

and move the keyring from global to client
this makes it possible to omit the osd keyring path
(which was the default but got overwritten from the global section)

Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
 PVE/API2/Ceph.pm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
index 2db9c7db..5c38d8f2 100644
--- a/PVE/API2/Ceph.pm
+++ b/PVE/API2/Ceph.pm
@@ -320,7 +320,6 @@ __PACKAGE__->register_method ({
 		'auth cluster required' => $auth,
 		'auth service required' => $auth,
 		'auth client required' => $auth,
-		'osd journal size' => $pve_osd_default_journal_size,
 		'osd pool default size' => $param->{size} // 3,
 		'osd pool default min size' => $param->{min_size} // 2,
 		'mon allow pool delete' => 'true',
@@ -331,8 +330,7 @@ __PACKAGE__->register_method ({
 	    #'osd pool default pgp num' => $pg_num,
 	}
 
-	$cfg->{global}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring';
-	$cfg->{osd}->{keyring} = '/var/lib/ceph/osd/ceph-$id/keyring';
+	$cfg->{client}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring';
 
 	if ($param->{pg_bits}) {
 	    $cfg->{global}->{'osd pg bits'} = $param->{pg_bits};
-- 
2.11.0