From 88a6e29ad19a5c5c4111d03bc6040f16d2a7ee7c Mon Sep 17 00:00:00 2001
From: Dietmar Maurer <dietmar@proxmox.com>
Date: Thu, 21 Nov 2013 09:11:02 +0100
Subject: [PATCH] set correct keyring location for osd

---
 PVE/API2/Ceph.pm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm
index 046c2d0f..b01663e3 100644
--- a/PVE/API2/Ceph.pm
+++ b/PVE/API2/Ceph.pm
@@ -542,8 +542,6 @@ __PACKAGE__->register_method ({
 	# simply load old config if it already exists
 	my $cfg = &$parse_ceph_config($pve_ceph_cfgpath);
 
-	my $keyring = '/etc/pve/priv/$cluster.$name.keyring';
-
 	if (!$cfg->{global}) {
 
 	    my $fsid;
@@ -568,7 +566,8 @@ __PACKAGE__->register_method ({
 	    #'osd pool default pgp num' => $pg_num, 
 	}
 	
-	$cfg->{global}->{keyring} = $keyring;
+	$cfg->{global}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring';
+	$cfg->{osd}->{keyring} = "/var/lib/ceph/osd/ceph-$id/keyring";
 
 	$cfg->{global}->{'osd pool default size'} = $param->{size} if $param->{size};