pveceph: fix purge command

diff --git a/bin/pveceph b/bin/pveceph
index 0def860be9d91a5f4cd4fd8a35a50231fd68e592..a0a9e95e749dd7ef8b9a2ead0f35e1ca4eb2c0b8 100755 (executable)
--- a/bin/pveceph
+++ b/bin/pveceph
@@ -16,6 +16,7 @@ use PVE::RPCEnvironment;
 use PVE::Storage;
 use PVE::Tools qw(run_command);
 use PVE::JSONSchema qw(get_standard_option);
 use PVE::Storage;
 use PVE::Tools qw(run_command);
 use PVE::JSONSchema qw(get_standard_option);

+use PVE::CephTools;

 use PVE::API2::Ceph;
 
 use PVE::CLIHandler;
 use PVE::API2::Ceph;
 
 use PVE::CLIHandler;


@@ -60,14 +61,17 @@ __PACKAGE__->register_method ({
 
        my $monstat;
 
 
        my $monstat;
 

-       eval { $monstat = PVE::API2::Ceph::ceph_mon_status(1); };
+       eval { 
+           my $rados = PVE::RADOS->new();
+           my $monstat = $rados->mon_command({ prefix => 'mon_status' });
+       };

        my $err = $@;
 
        die "detected running ceph services- unable to purge data\n" 
            if !$err;
 
        # fixme: this is dangerous - should we really support this function?
        my $err = $@;
 
        die "detected running ceph services- unable to purge data\n" 
            if !$err;
 
        # fixme: this is dangerous - should we really support this function?

-       PVE::API2::Ceph::purge_all_ceph_files();
+       PVE::CephTools::purge_all_ceph_files();

 
        return undef;
     }});
 
        return undef;
     }});