From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Thu, 28 May 2020 13:22:47 +0000 (+0200)
Subject: pveceph: allow installing octopus as experimental option
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=686532a4212251d553668646a9482b9d762cd475;p=pve-manager-legacy.git

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 eac3743a..69e83371 100755
--- 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";
 	}