Revert "buildsys: change upload/repo dist to bullseye"

pushed by mistake, please ignore this and the previous one

This reverts commit 4816c96931fb52993dac6ba966303ebf25d30a12.

diff --git a/Makefile b/Makefile
index 2be2972fd0f3a146896613a12ae9197070e785ab..e23327d9e7af749cf09d0b6aa9aa4c8c094b2010 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ $(DEB):
 upload: ${DEB} check
        # check if working directory is clean
        git diff --exit-code --stat && git diff --exit-code --stat --staged
-       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist bullseye
+       tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com upload --product pve --dist buster
 
 .PHONY: install
 install: vzdump-hook-script.pl

diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index 7021b23bd74ec6ac2e7c3172414a5eef0a3592c4..30e7507695d4ca300ecebd46c00ece57746a0e9f 100755 (executable)
--- 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 => ['octopus', 'pacific'],
-               default => 'pacific',
+               enum => ['luminous', 'nautilus', 'octopus'],
+               default => 'nautilus',
                description => "Ceph version to install.",
                optional => 1,
            },
@@ -128,40 +128,29 @@ __PACKAGE__->register_method ({
                optional => 1,
                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' },
     code => sub {
        my ($param) = @_;
 
-       my $cephver = $param->{version} || 'pacific'; # NOTE: always change default here too!
-
-       my $repo = $param->{'test-repository'} ? 'test' : 'main';
+       my $cephver = $param->{version} || 'nautilus';
 
        my $repolist;
-       if ($cephver eq 'octopus') {
-           $repolist = "deb http://download.proxmox.com/debian/ceph-octopus 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-octopus bullseye ceph-15\n"; # TODO: for test only, delete
-       } elsif ($cephver eq 'pacific') {
-           $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
+       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";
        } else {
-           die "unsupported ceph version: $cephver";
+           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/^(?:octopus|pacific)$/;
+           if $cephver !~ qr/^(?:nautilus|octopus)$/;
 
        local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
        print "update available package list\n";

diff --git a/configs/pve-sources.list b/configs/pve-sources.list
index 9a763cbcd0af1bbdd8d9d63ea12a44cae12396a1..2a4e596d15c6b1842f2b6e14a856171f5a0e4b6c 100644 (file)
--- a/configs/pve-sources.list
+++ b/configs/pve-sources.list
@@ -1 +1 @@
-deb https://enterprise.proxmox.com/debian/pve bullseye pve-enterprise
+deb https://enterprise.proxmox.com/debian/pve buster pve-enterprise

diff --git a/debian/changelog b/debian/changelog
index f200972b53e87d83711b3add644e64d758c720f3..5d295a479d8456d909d4afed13dd1cf5527cafc1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,3 @@
-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
 
   * pvereport: log pressure stall information

diff --git a/www/manager6/ceph/CephInstallWizard.js b/www/manager6/ceph/CephInstallWizard.js
index 00ac2cc406d79c428359e05b1533ee34f1fcf67e..76fbdc63d4b4fcf9669c366c3c1d1c0f20fb2813 100644 (file)
--- a/www/manager6/ceph/CephInstallWizard.js
+++ b/www/manager6/ceph/CephInstallWizard.js
@@ -49,8 +49,9 @@ Ext.define('PVE.ceph.CephVersionSelector', {
            },
        },
        data: [
+           { release: "nautilus", version: "14.2" },
            { release: "octopus", version: "15.2" },
-           { release: "pacific", version: "16.2" },
+           //{release: "pacific", version: "16.1"},
        ],
     },
 });