proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-29 23:41:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

buildsys: change upload/repo dist to bullseye

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-20 14:55:53 +02:00
parent 2e2b3a7e9a
commit 4816c96931
5 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -45,7 +45,7 @@ $(DEB):
upload: ${DEB} check upload: ${DEB} check
# check if working directory is clean # check if working directory is clean
git diff --exit-code --stat && git diff --exit-code --stat --staged 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 .PHONY: install
install: vzdump-hook-script.pl install: vzdump-hook-script.pl

35
PVE/CLI/pveceph.pm
View File

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

2
configs/pve-sources.list
View File

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

6
debian/changelog vendored
View File

@ -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 pve-manager (6.4-7) pve; urgency=medium
* pvereport: log pressure stall information * pvereport: log pressure stall information

3
www/manager6/ceph/CephInstallWizard.js
View File

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