proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-03 13:30:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pveceph install: allow nautilus and use as default

Browse Source 
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>
This commit is contained in:
Thomas Lamprecht 2019-05-27 15:49:02 +02:00
parent 87166f36ad
commit c3d9c6980d
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
PVE/CLI/pveceph.pm
View File

@ -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";

2
www/manager6/window/CephInstall.js
View File

@ -23,7 +23,7 @@ Ext.define('PVE.ceph.Install', {
},
viewModel: {
data: {
cephVersion: 'luminous',
cephVersion: 'nautilus',
isInstalled: false
},
formulas: {