pveceph install: allow nautilus and use as default

We allow 'luminous' still for testing purpose, it could be also
useful if one already upgraded his cluster to PVE 6.0 / Buster but
not yet ceph and due to a incident needs to setup a new luminous node
on Buster to get  healthy again. This is fabricated but not
unthinkable, as it costs nothing and isn't available for WebUI user
just keep it for now. Remove with a future point release though.
Use non-public repo for now, will be updated to testing soon.

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

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 56b6ba667b463bba8ee4726c6adce5f84757d6cc..4e291e8fd0b480b52fd74b4021d6930fa9a77f59 100755 (executable)
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -82,8 +82,10 @@ __PACKAGE__->register_method ({
        properties => {
            version => {
                type => 'string',
-               #enum => ['hammer', 'jewel'], # for jessie
-               enum => ['luminous',], # for stretch
+               # for buster, luminous kept for testing/upgrade purposes only! - FIXME: remove with 6.2?
+               enum => ['luminous', 'nautilus',],
+               default => 'nautilus',
+               description => "Ceph version to install.",
                optional => 1,
            }
        },
@@ -92,14 +94,22 @@ __PACKAGE__->register_method ({
     code => sub {
        my ($param) = @_;
 
-       my $cephver = $param->{version} || 'luminous';
+       my $default_vers = 'nautilus';
+       my $cephver = $param->{version} || $default_vers;
 
-       if ($cephver eq 'luminous') {
-           PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list",
-               "deb http://download.proxmox.com/debian/ceph-luminous stretch main\n");
+       my $repolist;
+       if ($cephver eq 'nautilus') {
+               $repolist = "deb http://download.proxmox.com/debian/ceph-nautilus buster main\n";
+               # FIXME: remove non-public testing repo
+               $repolist = "deb http://repo.proxmox.com/staging/ceph-nautilus buster ceph-14.0\n";
+       } elsif ($cephver eq 'luminous') {
+               $repolist = "deb http://download.proxmox.com/debian/ceph-luminous buster main\n";
        } 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\n" if $cephver ne $default_vers;
 
        local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
        print "update available package list\n";

diff --git a/www/manager6/window/CephInstall.js b/www/manager6/window/CephInstall.js
index a2c19c4256afde3735bf34853123425fd400205b..f2220934974bcb6c75ae2afabd979d14f5140ee8 100644 (file)
--- a/www/manager6/window/CephInstall.js
+++ b/www/manager6/window/CephInstall.js
@@ -23,7 +23,7 @@ Ext.define('PVE.ceph.Install', {
     },
     viewModel: {
        data: {
-             cephVersion: 'luminous',
+             cephVersion: 'nautilus',
              isInstalled: false
        },
        formulas: {