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

enable ceph 16.2 pacific

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-05-20 20:54:52 +02:00
parent f0982ad94b
commit 00fa70bfd9
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
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,
}, },
@ -134,23 +134,26 @@ __PACKAGE__->register_method ({
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 $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 main\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 main\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 "not implemented 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";

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" },
], ],
}, },
}); });