diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm index 30e75076..341ac437 100755 --- a/PVE/CLI/pveceph.pm +++ b/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, }, @@ -134,23 +134,26 @@ __PACKAGE__->register_method ({ code => sub { my ($param) = @_; - my $cephver = $param->{version} || 'nautilus'; + my $cephver = $param->{version} || 'pacific'; # NOTE: always change default here too! 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 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-octopus bullseye ceph-15\n"; # TODO: for test only, delete + } elsif ($cephver eq 'pacific') { + $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 { die "not implemented 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"; diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js index 76fbdc63..00ac2cc4 100644 --- a/www/manager6/ceph/CephInstallWizard.js +++ b/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" }, ], }, });