buildsys: change upload/repo dist to bullseye

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

Makefile

@@ -45,7 +45,7 @@ $(DEB):
 upload: ${DEB} check
 	# check if working directory is clean
 	git diff --exit-code --stat && git diff --exit-code --stat --staged
-	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist buster
+	tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
 
 .PHONY: install
 install: vzdump-hook-script.pl

PVE/CLI/pveceph.pm

@@ -117,8 +117,8 @@ __PACKAGE__->register_method ({
 	    version => {
 		type => 'string',
 		# for buster, luminous kept for testing/upgrade purposes only! - FIXME: remove with 6.2?
-		enum => ['luminous', 'nautilus', 'octopus'],
-		default => 'nautilus',
+		enum => ['octopus', 'pacific'],
+		default => 'pacific',
 		description => "Ceph version to install.",
 		optional => 1,
 	    },
@@ -128,29 +128,40 @@ __PACKAGE__->register_method ({
 		optional => 1,
 		description => "Allow experimental versions. Use with care!",
 	    },
+	    'test-repository' => {
+		type => 'boolean',
+		default => 0,
+		optional => 1,
+		description => "Use the test, not the main repository. Use with care!",
+	    },
 	},
     },
     returns => { type => 'null' },
     code => sub {
 	my ($param) = @_;
 
-	my $cephver = $param->{version} || 'nautilus';
+	my $cephver = $param->{version} || 'pacific'; # NOTE: always change default here too!
+
+	my $repo = $param->{'test-repository'} ? 'test' : 'main';
 
 	my $repolist;
-	if ($cephver eq 'nautilus') {
-	    $repolist = "deb http://download.proxmox.com/debian/ceph-nautilus buster main\n";
-	} elsif ($cephver eq 'luminous') {
-	    die "Not allowed to select version '$cephver'\n" if !$param->{'allow-experimental'};
-	    $repolist = "deb http://download.proxmox.com/debian/ceph-luminous buster main\n";
-	} elsif ($cephver eq 'octopus') {
-	    $repolist = "deb http://download.proxmox.com/debian/ceph-octopus buster main\n";
+	if ($cephver eq 'octopus') {
+	    $repolist = "deb http://download.proxmox.com/debian/ceph-octopus bullseye $repo\n";
+	    # FIXME: delete below for release!
+	    warn "NOTE: using internal test repository as public may not be available yet\n";
+	    $repolist = "deb http://repo.proxmox.com/staging/ceph-octopus bullseye ceph-15\n"; # TODO: for test only, delete
+	} elsif ($cephver eq 'pacific') {
+	    $repolist = "deb http://download.proxmox.com/debian/ceph-pacific bullseye $repo\n";
+	    # FIXME: delete below for release!
+	    warn "NOTE: using internal test repository as public may not be available yet\n";
+	    $repolist = "deb http://repo.proxmox.com/staging/ceph-pacific bullseye ceph-16\n"; # TODO: for test only, delete
 	} else {
-	    die "not implemented ceph version: $cephver";
+	    die "unsupported ceph version: $cephver";
 	}
 	PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list", $repolist);
 
 	warn "WARNING: installing non-default ceph release '$cephver'!\n"
-	    if $cephver !~ qr/^(?:nautilus|octopus)$/;
+	    if $cephver !~ qr/^(?:octopus|pacific)$/;
 
 	local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
 	print "update available package list\n";

configs/pve-sources.list

@@ -1 +1 @@
-deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise
+deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise

debian/changelog

@@ -1,3 +1,9 @@
+pve-manager (7.0-1) bullseye; urgency=medium
+
+  * re-build for Proxmox VE 7 based on Debian Bullseye
+
+ -- Proxmox Support Team <support@proxmox.com>  Wed, 19 May 2021 18:11:13 +0200
+
 pve-manager (6.4-7) pve; urgency=medium
 
   * pvereport: log pressure stall information

www/manager6/ceph/CephInstallWizard.js

@@ -49,9 +49,8 @@ Ext.define('PVE.ceph.CephVersionSelector', {
 	    },
 	},
 	data: [
-	    { release: "nautilus", version: "14.2" },
 	    { release: "octopus", version: "15.2" },
-	    //{release: "pacific", version: "16.1"},
+	    { release: "pacific", version: "16.2" },
 	],
     },
 });