[pve-devel] [PATCH storage] use correct ceph version command

Fabian Grünbichler f.gruenbichler at proxmox.com
Tue Jun 14 11:39:42 CEST 2016


"ceph version" retrieves the version from the cluster (i.e.,
from the queried monitor), but what is needed here is the
local ceph version, which is returned by "ceph --version".
---
Note: this broke external ceph clusters with no /etc/ceph/ceph.conf
and/or lower local version than cluster version

 PVE/Storage/RBDPlugin.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PVE/Storage/RBDPlugin.pm b/PVE/Storage/RBDPlugin.pm
index 76f3d2e..2ef7573 100644
--- a/PVE/Storage/RBDPlugin.pm
+++ b/PVE/Storage/RBDPlugin.pm
@@ -113,7 +113,7 @@ sub ceph_version {
     if (defined($version_string)) {
 	($major, $minor, $bugfix, $version_string) = &$ceph_version_parser($version_string);
     } else {
-	run_command('ceph version', outfunc => sub {
+	run_command('ceph --version', outfunc => sub {
 	    my $line = shift;
 	    ($major, $minor, $bugfix, $version_string) = &$ceph_version_parser($line);
 	});
-- 
2.1.4




More information about the pve-devel mailing list