pveceph: adapt to new Pool module

[pve-manager.git] / PVE / CLI / pveceph.pm

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index a85df130ec748472e24441d1ff41d3a91eaf4f37..52c91629861e54e98fa1858c745e1710123030a5 100755 (executable)
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -176,13 +176,18 @@ __PACKAGE__->register_method ({
        my @ceph_packages = qw(
            ceph
            ceph-common
-           ceph-volume
            ceph-mds
            ceph-fuse
            gdisk
            nvme-cli
        );
 
+       # got split out with quincy and is required by PVE tooling, conditionally exclude it for older
+       # FIXME: remove condition with PVE 8.0, i.e., once we only support quincy+ new installations
+       if ($cephver ne 'octopus' and $cephver ne 'pacific') {
+           push @ceph_packages, 'ceph-volume';
+       }
+
        print "start installation\n";
 
        # this flag helps to determine when apt is actually done installing (vs. partial extracing)
@@ -350,7 +355,7 @@ __PACKAGE__->register_method ({
 our $cmddef = {
     init => [ 'PVE::API2::Ceph', 'init', [], { node => $nodename } ],
     pool => {
-       ls => [ 'PVE::API2::Ceph::Pools', 'lspools', [], { node => $nodename }, sub {
+       ls => [ 'PVE::API2::Ceph::Pool', 'lspools', [], { node => $nodename }, sub {
            my ($data, $schema, $options) = @_;
            PVE::CLIFormatter::print_api_result($data, $schema,
                [
@@ -369,10 +374,10 @@ our $cmddef = {
                ],
                $options);
        }, $PVE::RESTHandler::standard_output_options],
-       create => [ 'PVE::API2::Ceph::Pools', 'createpool', ['name'], { node => $nodename }],
-       destroy => [ 'PVE::API2::Ceph::Pools', 'destroypool', ['name'], { node => $nodename } ],
-       set => [ 'PVE::API2::Ceph::Pools', 'setpool', ['name'], { node => $nodename } ],
-       get => [ 'PVE::API2::Ceph::Pools', 'getpool', ['name'], { node => $nodename }, sub {
+       create => [ 'PVE::API2::Ceph::Pool', 'createpool', ['name'], { node => $nodename }],
+       destroy => [ 'PVE::API2::Ceph::Pool', 'destroypool', ['name'], { node => $nodename } ],
+       set => [ 'PVE::API2::Ceph::Pool', 'setpool', ['name'], { node => $nodename } ],
+       get => [ 'PVE::API2::Ceph::Pool', 'getpool', ['name'], { node => $nodename }, sub {
            my ($data, $schema, $options) = @_;
            PVE::CLIFormatter::print_api_result($data, $schema, undef, $options);
        }, $PVE::RESTHandler::standard_output_options],