auto-format code using perltidy with Proxmox style guide
using the new top-level `make tidy` target, which calls perltidy via our wrapper to enforce the desired style as closely as possible. Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
@ -6,9 +6,7 @@ use Net::IP;
|
||||
use PVE::Tools qw(run_command);
|
||||
use PVE::Cluster qw(cfs_register_file);
|
||||
|
||||
cfs_register_file('ceph.conf',
|
||||
\&parse_ceph_config,
|
||||
\&write_ceph_config);
|
||||
cfs_register_file('ceph.conf', \&parse_ceph_config, \&write_ceph_config);
|
||||
|
||||
# For more information on how the Ceph parser works and how its grammar is
|
||||
# defined, see:
|
||||
@ -77,177 +75,177 @@ sub parse_ceph_config {
|
||||
my @lines = split(/\n/, $raw);
|
||||
|
||||
my $parse_section_header = sub {
|
||||
my ($section_line) = @_;
|
||||
my ($section_line) = @_;
|
||||
|
||||
# continued lines in section headers are allowed
|
||||
while ($section_line =~ s/$re_continue_marker$//) {
|
||||
$section_line .= shift(@lines);
|
||||
}
|
||||
# continued lines in section headers are allowed
|
||||
while ($section_line =~ s/$re_continue_marker$//) {
|
||||
$section_line .= shift(@lines);
|
||||
}
|
||||
|
||||
my $remainder = $section_line;
|
||||
my $remainder = $section_line;
|
||||
|
||||
$remainder =~ s/$re_section_header//;
|
||||
my $parsed_header = $1;
|
||||
$remainder =~ s/$re_section_header//;
|
||||
my $parsed_header = $1;
|
||||
|
||||
# Un-escape comment literals
|
||||
$parsed_header =~ s/\\($re_comment_class)/$1/g;
|
||||
# Un-escape comment literals
|
||||
$parsed_header =~ s/\\($re_comment_class)/$1/g;
|
||||
|
||||
if (!$parsed_header) {
|
||||
die "failed to parse section - skip: $section_line\n";
|
||||
}
|
||||
if (!$parsed_header) {
|
||||
die "failed to parse section - skip: $section_line\n";
|
||||
}
|
||||
|
||||
# preserve Ceph's behaviour and disallow anything after the section header
|
||||
# that's not whitespace or a comment
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
$remainder =~ s/^$re_comment_class.*$//;
|
||||
# preserve Ceph's behaviour and disallow anything after the section header
|
||||
# that's not whitespace or a comment
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
$remainder =~ s/^$re_comment_class.*$//;
|
||||
|
||||
if ($remainder) {
|
||||
die "unexpected remainder after section - skip: $section_line\n";
|
||||
}
|
||||
if ($remainder) {
|
||||
die "unexpected remainder after section - skip: $section_line\n";
|
||||
}
|
||||
|
||||
return $parsed_header;
|
||||
return $parsed_header;
|
||||
};
|
||||
|
||||
my $parse_key = sub {
|
||||
my ($line) = @_;
|
||||
my ($line) = @_;
|
||||
|
||||
my $remainder = $line;
|
||||
my $remainder = $line;
|
||||
|
||||
my $key = '';
|
||||
while ($remainder =~ s/$re_key//) {
|
||||
$key .= $1;
|
||||
my $key = '';
|
||||
while ($remainder =~ s/$re_key//) {
|
||||
$key .= $1;
|
||||
|
||||
while ($key =~ s/$re_continue_marker$//) {
|
||||
$remainder = shift(@lines);
|
||||
}
|
||||
}
|
||||
while ($key =~ s/$re_continue_marker$//) {
|
||||
$remainder = shift(@lines);
|
||||
}
|
||||
}
|
||||
|
||||
$key =~ s/$re_trailing_ws//;
|
||||
$key =~ s/$re_leading_ws//;
|
||||
$key =~ s/$re_trailing_ws//;
|
||||
$key =~ s/$re_leading_ws//;
|
||||
|
||||
$key =~ s/\s/ /;
|
||||
while ($key =~ s/\s\s/ /) {} # squeeze repeated whitespace
|
||||
$key =~ s/\s/ /;
|
||||
while ($key =~ s/\s\s/ /) { } # squeeze repeated whitespace
|
||||
|
||||
# Ceph treats *single* spaces in keys the same as underscores,
|
||||
# but we'll just use underscores for readability
|
||||
$key =~ s/ /_/g;
|
||||
# Ceph treats *single* spaces in keys the same as underscores,
|
||||
# but we'll just use underscores for readability
|
||||
$key =~ s/ /_/g;
|
||||
|
||||
# Un-escape comment literals
|
||||
$key =~ s/\\($re_comment_class)/$1/g;
|
||||
# Un-escape comment literals
|
||||
$key =~ s/\\($re_comment_class)/$1/g;
|
||||
|
||||
if ($key eq '') {
|
||||
die "failed to parse key from line - skip: $line\n";
|
||||
}
|
||||
if ($key eq '') {
|
||||
die "failed to parse key from line - skip: $line\n";
|
||||
}
|
||||
|
||||
my $had_equals = $remainder =~ s/^$re_kv_separator//;
|
||||
my $had_equals = $remainder =~ s/^$re_kv_separator//;
|
||||
|
||||
if (!$had_equals) {
|
||||
die "expected '=' after key - skip: $line\n";
|
||||
}
|
||||
if (!$had_equals) {
|
||||
die "expected '=' after key - skip: $line\n";
|
||||
}
|
||||
|
||||
while ($remainder =~ s/^$re_continue_marker$//) {
|
||||
# Whitespace and continuations after equals sign can be arbitrary
|
||||
$remainder = shift(@lines);
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
}
|
||||
while ($remainder =~ s/^$re_continue_marker$//) {
|
||||
# Whitespace and continuations after equals sign can be arbitrary
|
||||
$remainder = shift(@lines);
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
}
|
||||
|
||||
return ($key, $remainder);
|
||||
return ($key, $remainder);
|
||||
};
|
||||
|
||||
my $parse_value = sub {
|
||||
my ($line, $remainder) = @_;
|
||||
my ($line, $remainder) = @_;
|
||||
|
||||
my $starts_with_quote = $remainder =~ m/^['"]/;
|
||||
$remainder =~ s/$re_value//;
|
||||
my $value = $1 // '';
|
||||
my $starts_with_quote = $remainder =~ m/^['"]/;
|
||||
$remainder =~ s/$re_value//;
|
||||
my $value = $1 // '';
|
||||
|
||||
if ($value eq '') {
|
||||
die "failed to parse value - skip: $line\n";
|
||||
}
|
||||
if ($value eq '') {
|
||||
die "failed to parse value - skip: $line\n";
|
||||
}
|
||||
|
||||
if ($starts_with_quote) {
|
||||
# If it started with a quote, the parsed value MUST end with a quote
|
||||
my $is_single_quoted = $value =~ m/$re_single_quoted_value/;
|
||||
$value = $1 if $is_single_quoted;
|
||||
my $is_double_quoted = !$is_single_quoted && $value =~ m/$re_double_quoted_value/;
|
||||
$value = $1 if $is_double_quoted;
|
||||
if ($starts_with_quote) {
|
||||
# If it started with a quote, the parsed value MUST end with a quote
|
||||
my $is_single_quoted = $value =~ m/$re_single_quoted_value/;
|
||||
$value = $1 if $is_single_quoted;
|
||||
my $is_double_quoted = !$is_single_quoted && $value =~ m/$re_double_quoted_value/;
|
||||
$value = $1 if $is_double_quoted;
|
||||
|
||||
if (!($is_single_quoted || $is_double_quoted)) {
|
||||
die "failed to parse quoted value - skip: $line\n";
|
||||
}
|
||||
if (!($is_single_quoted || $is_double_quoted)) {
|
||||
die "failed to parse quoted value - skip: $line\n";
|
||||
}
|
||||
|
||||
# Optionally, *only* line continuations may *only* follow right after
|
||||
while ($remainder =~ s/^$re_continue_marker$//) {
|
||||
$remainder .= shift(@lines);
|
||||
}
|
||||
# Optionally, *only* line continuations may *only* follow right after
|
||||
while ($remainder =~ s/^$re_continue_marker$//) {
|
||||
$remainder .= shift(@lines);
|
||||
}
|
||||
|
||||
# Nothing but whitespace or a comment may follow
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
$remainder =~ s/^$re_comment_class.*$//;
|
||||
# Nothing but whitespace or a comment may follow
|
||||
$remainder =~ s/$re_leading_ws//;
|
||||
$remainder =~ s/^$re_comment_class.*$//;
|
||||
|
||||
if ($remainder) {
|
||||
die "unexpected remainder after value - skip: $line\n";
|
||||
}
|
||||
if ($remainder) {
|
||||
die "unexpected remainder after value - skip: $line\n";
|
||||
}
|
||||
|
||||
} else {
|
||||
while ($value =~ s/$re_continue_marker$//) {
|
||||
my $next_line = shift(@lines);
|
||||
} else {
|
||||
while ($value =~ s/$re_continue_marker$//) {
|
||||
my $next_line = shift(@lines);
|
||||
|
||||
$next_line =~ s/$re_unquoted_value//;
|
||||
my $value_part = $1 // '';
|
||||
$value .= $value_part;
|
||||
}
|
||||
$next_line =~ s/$re_unquoted_value//;
|
||||
my $value_part = $1 // '';
|
||||
$value .= $value_part;
|
||||
}
|
||||
|
||||
$value =~ s/$re_trailing_ws//;
|
||||
}
|
||||
$value =~ s/$re_trailing_ws//;
|
||||
}
|
||||
|
||||
# Un-escape comment literals
|
||||
$value =~ s/\\($re_comment_class)/$1/g;
|
||||
# Un-escape comment literals
|
||||
$value =~ s/\\($re_comment_class)/$1/g;
|
||||
|
||||
return $value;
|
||||
return $value;
|
||||
};
|
||||
|
||||
while (scalar(@lines)) {
|
||||
my $line = shift(@lines);
|
||||
my $line = shift(@lines);
|
||||
|
||||
$line =~ s/^\s*(?<!\\)$re_comment_class.*$//;
|
||||
$line =~ s/^\s*$//;
|
||||
next if !$line;
|
||||
next if $line =~ m/^$re_continue_marker$/;
|
||||
$line =~ s/^\s*(?<!\\)$re_comment_class.*$//;
|
||||
$line =~ s/^\s*$//;
|
||||
next if !$line;
|
||||
next if $line =~ m/^$re_continue_marker$/;
|
||||
|
||||
if ($line =~ m/$re_section_start/) {
|
||||
$section = undef;
|
||||
if ($line =~ m/$re_section_start/) {
|
||||
$section = undef;
|
||||
|
||||
eval { $section = $parse_section_header->($line) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
}
|
||||
eval { $section = $parse_section_header->($line) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
}
|
||||
|
||||
if (defined($section)) {
|
||||
$cfg->{$section} = {} if !exists($cfg->{$section});
|
||||
}
|
||||
if (defined($section)) {
|
||||
$cfg->{$section} = {} if !exists($cfg->{$section});
|
||||
}
|
||||
|
||||
next;
|
||||
}
|
||||
next;
|
||||
}
|
||||
|
||||
if (!defined($section)) {
|
||||
warn "no section header - skip: $line\n";
|
||||
next;
|
||||
}
|
||||
if (!defined($section)) {
|
||||
warn "no section header - skip: $line\n";
|
||||
next;
|
||||
}
|
||||
|
||||
my ($key, $remainder) = eval { $parse_key->($line) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
next;
|
||||
}
|
||||
my ($key, $remainder) = eval { $parse_key->($line) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
next;
|
||||
}
|
||||
|
||||
my $value = eval { $parse_value->($line, $remainder) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
next;
|
||||
}
|
||||
my $value = eval { $parse_value->($line, $remainder) };
|
||||
if ($@) {
|
||||
warn "$@\n";
|
||||
next;
|
||||
}
|
||||
|
||||
$cfg->{$section}->{$key} = $value;
|
||||
$cfg->{$section}->{$key} = $value;
|
||||
}
|
||||
|
||||
return $cfg;
|
||||
@ -258,7 +256,7 @@ my $parse_ceph_file = sub {
|
||||
|
||||
my $cfg = {};
|
||||
|
||||
return $cfg if ! -f $filename;
|
||||
return $cfg if !-f $filename;
|
||||
|
||||
my $content = PVE::Tools::file_get_contents($filename);
|
||||
|
||||
@ -272,45 +270,45 @@ sub write_ceph_config {
|
||||
my $out = '';
|
||||
|
||||
my $cond_write_sec = sub {
|
||||
my $re = shift;
|
||||
my $re = shift;
|
||||
|
||||
for my $section (sort keys $cfg->%*) {
|
||||
next if $section !~ m/^$re$/;
|
||||
next if exists($written_sections->{$section});
|
||||
for my $section (sort keys $cfg->%*) {
|
||||
next if $section !~ m/^$re$/;
|
||||
next if exists($written_sections->{$section});
|
||||
|
||||
$out .= "[$section]\n";
|
||||
for my $key (sort keys $cfg->{$section}->%*) {
|
||||
$out .= "\t$key = $cfg->{$section}->{$key}\n";
|
||||
}
|
||||
$out .= "\n";
|
||||
$out .= "[$section]\n";
|
||||
for my $key (sort keys $cfg->{$section}->%*) {
|
||||
$out .= "\t$key = $cfg->{$section}->{$key}\n";
|
||||
}
|
||||
$out .= "\n";
|
||||
|
||||
$written_sections->{$section} = 1;
|
||||
}
|
||||
$written_sections->{$section} = 1;
|
||||
}
|
||||
};
|
||||
|
||||
my @rexprs = (
|
||||
qr/global/,
|
||||
qr/global/,
|
||||
|
||||
qr/client/,
|
||||
qr/client\..*/,
|
||||
qr/client/,
|
||||
qr/client\..*/,
|
||||
|
||||
qr/mds/,
|
||||
qr/mds\..*/,
|
||||
qr/mds/,
|
||||
qr/mds\..*/,
|
||||
|
||||
qr/mon/,
|
||||
qr/mon\..*/,
|
||||
qr/mon/,
|
||||
qr/mon\..*/,
|
||||
|
||||
qr/osd/,
|
||||
qr/osd\..*/,
|
||||
qr/osd/,
|
||||
qr/osd\..*/,
|
||||
|
||||
qr/mgr/,
|
||||
qr/mgr\..*/,
|
||||
qr/mgr/,
|
||||
qr/mgr\..*/,
|
||||
|
||||
qr/.*/,
|
||||
qr/.*/,
|
||||
);
|
||||
|
||||
for my $re (@rexprs) {
|
||||
$cond_write_sec->($re);
|
||||
$cond_write_sec->($re);
|
||||
}
|
||||
|
||||
# Escape comment literals that aren't escaped already
|
||||
@ -332,7 +330,7 @@ my $get_host = sub {
|
||||
my ($hostport) = @_;
|
||||
my ($host, $port) = PVE::Tools::parse_host_and_port($hostport);
|
||||
if (!defined($host)) {
|
||||
return "";
|
||||
return "";
|
||||
}
|
||||
$port = defined($port) ? ":$port" : '';
|
||||
$host = "[$host]" if Net::IP::ip_is_ipv6($host);
|
||||
@ -343,8 +341,8 @@ sub get_monaddr_list {
|
||||
my ($configfile) = shift;
|
||||
|
||||
if (!defined($configfile)) {
|
||||
warn "No ceph config specified\n";
|
||||
return;
|
||||
warn "No ceph config specified\n";
|
||||
return;
|
||||
}
|
||||
|
||||
my $config = $parse_ceph_file->($configfile);
|
||||
@ -352,24 +350,24 @@ sub get_monaddr_list {
|
||||
my $monhostlist = {};
|
||||
|
||||
# get all ip addresses from mon_host
|
||||
my $monhosts = [ split (/[ ,;]+/, $config->{global}->{mon_host} // "") ];
|
||||
my $monhosts = [split(/[ ,;]+/, $config->{global}->{mon_host} // "")];
|
||||
|
||||
foreach my $monhost (@$monhosts) {
|
||||
$monhost =~ s/^\[?v\d\://; # remove beginning of vector
|
||||
$monhost =~ s|/\d+\]?||; # remove end of vector
|
||||
my $host = $get_host->($monhost);
|
||||
if ($host ne "") {
|
||||
$monhostlist->{$host} = 1;
|
||||
}
|
||||
$monhost =~ s/^\[?v\d\://; # remove beginning of vector
|
||||
$monhost =~ s|/\d+\]?||; # remove end of vector
|
||||
my $host = $get_host->($monhost);
|
||||
if ($host ne "") {
|
||||
$monhostlist->{$host} = 1;
|
||||
}
|
||||
}
|
||||
|
||||
# then get all addrs from mon. sections
|
||||
for my $section ( keys %$config ) {
|
||||
next if $section !~ m/^mon\./;
|
||||
for my $section (keys %$config) {
|
||||
next if $section !~ m/^mon\./;
|
||||
|
||||
if (my $addr = $config->{$section}->{mon_addr}) {
|
||||
$monhostlist->{$addr} = 1;
|
||||
}
|
||||
if (my $addr = $config->{$section}->{mon_addr}) {
|
||||
$monhostlist->{$addr} = 1;
|
||||
}
|
||||
}
|
||||
|
||||
return join(',', sort keys %$monhostlist);
|
||||
@ -385,17 +383,17 @@ sub hostlist {
|
||||
my $ceph_check_keyfile = sub {
|
||||
my ($filename, $type) = @_;
|
||||
|
||||
return if ! -f $filename;
|
||||
return if !-f $filename;
|
||||
|
||||
my $content = PVE::Tools::file_get_contents($filename);
|
||||
eval {
|
||||
die if !$content;
|
||||
die if !$content;
|
||||
|
||||
if ($type eq 'rbd') {
|
||||
die if $content !~ /\s*\[\S+\]\s*key\s*=\s*\S+==\s*$/m;
|
||||
} elsif ($type eq 'cephfs') {
|
||||
die if $content !~ /\S+==\s*$/;
|
||||
}
|
||||
if ($type eq 'rbd') {
|
||||
die if $content !~ /\s*\[\S+\]\s*key\s*=\s*\S+==\s*$/m;
|
||||
} elsif ($type eq 'cephfs') {
|
||||
die if $content !~ /\S+==\s*$/;
|
||||
}
|
||||
};
|
||||
die "Not a proper $type authentication file: $filename\n" if $@;
|
||||
|
||||
@ -415,23 +413,24 @@ sub ceph_connect_option {
|
||||
$ceph_check_keyfile->($keyfile, $scfg->{type});
|
||||
|
||||
if (-e "/etc/pve/priv/ceph/${storeid}.conf") {
|
||||
# allow custom ceph configuration for external clusters
|
||||
if ($pveceph_managed) {
|
||||
warn "ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n";
|
||||
} else {
|
||||
$cmd_option->{ceph_conf} = "/etc/pve/priv/ceph/${storeid}.conf";
|
||||
}
|
||||
# allow custom ceph configuration for external clusters
|
||||
if ($pveceph_managed) {
|
||||
warn
|
||||
"ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n";
|
||||
} else {
|
||||
$cmd_option->{ceph_conf} = "/etc/pve/priv/ceph/${storeid}.conf";
|
||||
}
|
||||
}
|
||||
|
||||
$cmd_option->{keyring} = $keyfile if (-e $keyfile);
|
||||
$cmd_option->{auth_supported} = (defined $cmd_option->{keyring}) ? 'cephx' : 'none';
|
||||
$cmd_option->{userid} = $scfg->{username} ? $scfg->{username} : 'admin';
|
||||
$cmd_option->{userid} = $scfg->{username} ? $scfg->{username} : 'admin';
|
||||
$cmd_option->{mon_host} = hostlist($scfg->{monhost}, ',') if (defined($scfg->{monhost}));
|
||||
|
||||
if (%options) {
|
||||
foreach my $k (keys %options) {
|
||||
$cmd_option->{$k} = $options{$k};
|
||||
}
|
||||
foreach my $k (keys %options) {
|
||||
$cmd_option->{$k} = $options{$k};
|
||||
}
|
||||
}
|
||||
|
||||
return $cmd_option;
|
||||
@ -448,30 +447,31 @@ sub ceph_create_keyfile {
|
||||
my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.$extension";
|
||||
|
||||
die "ceph authx keyring file for storage '$storeid' already exists!\n"
|
||||
if -e $ceph_storage_keyring && !defined($secret);
|
||||
if -e $ceph_storage_keyring && !defined($secret);
|
||||
|
||||
if (-e $ceph_admin_keyring || defined($secret)) {
|
||||
eval {
|
||||
if (defined($secret)) {
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
chomp $secret;
|
||||
PVE::Tools::file_set_contents($ceph_storage_keyring, "${secret}\n", 0400);
|
||||
} elsif ($type eq 'rbd') {
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
|
||||
} elsif ($type eq 'cephfs') {
|
||||
my $cephfs_secret = $ceph_get_key->($ceph_admin_keyring, 'admin');
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
chomp $cephfs_secret;
|
||||
PVE::Tools::file_set_contents($ceph_storage_keyring, "${cephfs_secret}\n", 0400);
|
||||
}
|
||||
};
|
||||
if (my $err = $@) {
|
||||
unlink $ceph_storage_keyring;
|
||||
die "failed to copy ceph authx $extension for storage '$storeid': $err\n";
|
||||
}
|
||||
eval {
|
||||
if (defined($secret)) {
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
chomp $secret;
|
||||
PVE::Tools::file_set_contents($ceph_storage_keyring, "${secret}\n", 0400);
|
||||
} elsif ($type eq 'rbd') {
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
|
||||
} elsif ($type eq 'cephfs') {
|
||||
my $cephfs_secret = $ceph_get_key->($ceph_admin_keyring, 'admin');
|
||||
mkdir '/etc/pve/priv/ceph';
|
||||
chomp $cephfs_secret;
|
||||
PVE::Tools::file_set_contents($ceph_storage_keyring, "${cephfs_secret}\n",
|
||||
0400);
|
||||
}
|
||||
};
|
||||
if (my $err = $@) {
|
||||
unlink $ceph_storage_keyring;
|
||||
die "failed to copy ceph authx $extension for storage '$storeid': $err\n";
|
||||
}
|
||||
} else {
|
||||
warn "$ceph_admin_keyring not found, authentication is disabled.\n";
|
||||
warn "$ceph_admin_keyring not found, authentication is disabled.\n";
|
||||
}
|
||||
}
|
||||
|
||||
@ -483,7 +483,7 @@ sub ceph_remove_keyfile {
|
||||
my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.$extension";
|
||||
|
||||
if (-f $ceph_storage_keyring) {
|
||||
unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
|
||||
unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
|
||||
}
|
||||
}
|
||||
|
||||
@ -491,10 +491,10 @@ my $ceph_version_parser = sub {
|
||||
my $ceph_version = shift;
|
||||
# FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
|
||||
if ($ceph_version =~ /^ceph.*\sv?(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
|
||||
my ($version, $buildcommit) = ($1, $2);
|
||||
my $subversions = [ split(/\.|-/, $version) ];
|
||||
my ($version, $buildcommit) = ($1, $2);
|
||||
my $subversions = [split(/\.|-/, $version)];
|
||||
|
||||
return ($subversions, $version, $buildcommit);
|
||||
return ($subversions, $version, $buildcommit);
|
||||
}
|
||||
warn "Could not parse Ceph version: '$ceph_version'\n";
|
||||
};
|
||||
@ -504,9 +504,12 @@ sub local_ceph_version {
|
||||
|
||||
my $version_string = $cache;
|
||||
if (!defined($version_string)) {
|
||||
run_command('ceph --version', outfunc => sub {
|
||||
$version_string = shift;
|
||||
});
|
||||
run_command(
|
||||
'ceph --version',
|
||||
outfunc => sub {
|
||||
$version_string = shift;
|
||||
},
|
||||
);
|
||||
}
|
||||
return undef if !defined($version_string);
|
||||
# subversion is an array ref. with the version parts from major to minor
|
||||
|
||||
Reference in New Issue
Block a user