From cee8e2b661b9f7372c3848ca7d71b848f707375d Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Mon, 30 Dec 2013 13:50:01 +0100 Subject: [PATCH] fix osd remove --- PVE/API2/Ceph.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm index eabbc5cb..0dc609d2 100644 --- a/PVE/API2/Ceph.pm +++ b/PVE/API2/Ceph.pm @@ -1159,7 +1159,7 @@ __PACKAGE__->register_method ({ '--', $param->{dev}]); }; - return $rpcenv->fork_worker('cephcreateods', $param->{dev}, $authuser, $worker); + return $rpcenv->fork_worker('cephcreateosd', $param->{dev}, $authuser, $worker); }}); __PACKAGE__->register_method ({ @@ -1211,18 +1211,18 @@ __PACKAGE__->register_method ({ die "osd is still runnung (up == 1)\n" if $osdstat->{up}; - my $osdsection = "osd.$osdid"; + my $osdsection = "osd.$osdid"; my $worker = sub { my $upid = shift; - print "destroy OSD $param->{osdid}\n"; + print "destroy OSD $osdsection\n"; eval { &$ceph_service_cmd('stop', $osdsection); }; warn $@ if $@; print "Remove $osdsection from the CRUSH map\n"; - &$run_ceph_cmd(['osd', 'crush', 'remove', $osdid]); + &$run_ceph_cmd(['osd', 'crush', 'remove', $osdsection]); print "Remove the $osdsection authentication key.\n"; &$run_ceph_cmd(['auth', 'del', $osdsection]); @@ -1231,7 +1231,7 @@ __PACKAGE__->register_method ({ &$run_ceph_cmd(['osd', 'rm', $osdid]); }; - return $rpcenv->fork_worker('cephdestroyods', $osdsection, $authuser, $worker); + return $rpcenv->fork_worker('cephdestroyosd', $osdsection, $authuser, $worker); }}); __PACKAGE__->register_method ({