pveceph: allow installing octopus as experimental option

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index eac3743a4e3fd8eae576528e8de81d1e5c2678d9..69e83371ac65cd3ae65be4b3bc9432e4ae4cd43f 100755 (executable)
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -117,11 +117,17 @@ __PACKAGE__->register_method ({
            version => {
                type => 'string',
                # for buster, luminous kept for testing/upgrade purposes only! - FIXME: remove with 6.2?
-               enum => ['luminous', 'nautilus',],
+               enum => ['luminous', 'nautilus', 'octopus'],
                default => 'nautilus',
                description => "Ceph version to install.",
                optional => 1,
-           }
+           },
+           'allow-experimental' => {
+               type => 'boolean',
+               default => 0,
+               optional => 1,
+               description => "Allow experimental versions. Use with care!",
+           },
        },
     },
     returns => { type => 'null' },
@@ -133,9 +139,14 @@ __PACKAGE__->register_method ({
 
        my $repolist;
        if ($cephver eq 'nautilus') {
-               $repolist = "deb http://download.proxmox.com/debian/ceph-nautilus buster main\n";
+           $repolist = "deb http://download.proxmox.com/debian/ceph-nautilus buster main\n";
        } elsif ($cephver eq 'luminous') {
-               $repolist = "deb http://download.proxmox.com/debian/ceph-luminous buster main\n";
+           $repolist = "deb http://download.proxmox.com/debian/ceph-luminous buster main\n";
+       } elsif ($cephver eq 'octopus') {
+           die "Not allowed to select version '$cephver'\n" if !$param->{'allow-experimental'};
+           $repolist = "deb http://repo.proxmox.com/staging/ceph-octopus buster ceph-15\n";
+           # FIXME: use public mirror once available
+           #$repolist = "deb http://download.proxmox.com/debian/ceph-octopus buster main\n";
        } else {
            die "not implemented ceph version: $cephver";
        }