[pve-devel] applied: [PATCH storage] d/control: bump ceph dependency to 12.2

Thomas Lamprecht t.lamprecht at proxmox.com
Sat Apr 25 11:31:09 CEST 2020


A newer than the Luminous version is shipped with buster, and our
ceph repos are on Nautilus (14.2) in PVE 6.

Allows to drop a check for really old ceph versions (< 10, so
Infernalis and older).

Signed-off-by: Thomas Lamprecht <t.lamprecht at proxmox.com>
---
 PVE/Storage/RBDPlugin.pm | 3 ---
 debian/control           | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 7371721..38f2b46 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -77,9 +77,6 @@ my $librados_connect = sub {
 my $krbd_feature_update = sub {
     my ($scfg, $storeid, $name) = @_;
 
-    my ($versionparts) = PVE::CephConfig::ceph_version();
-    return 1 if $versionparts->[0] < 10;
-
     my (@disable, @enable);
     my ($kmajor, $kminor) = PVE::ProcFSTools::kernel_version();
 
diff --git a/debian/control b/debian/control
index 22a0b20..ee76476 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Breaks: libpve-guest-common-perl (<< 3.0-7),
         pve-container (<< 3.1-2),
         pve-manager (<< 5.2-12),
         qemu-server (<< 6.1-14),
-Depends: ceph-common,
+Depends: ceph-common (>= 12.2~),
          ceph-fuse,
          cifs-utils,
          cstream,
-- 
2.20.1





More information about the pve-devel mailing list