yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add simple keyring check for cephfs/rbd

Browse Source 
Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich
2018-07-04 12:43:30 +02:00
committed by Thomas Lamprecht
parent 9b7ba1db42
commit 3e47917203
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
PVE/Storage/CephTools.pm
View File

@ -5,6 +5,35 @@ use warnings;
use Net::IP;
use PVE::Tools qw(run_command);
my $ceph_check_keyfile = sub {
my ($filename, $scfg) = @_;
if (-f $filename) {
my $content = PVE::Tools::file_get_contents($filename);
my @lines = split /\n/, $content;
my $section;
foreach my $line (@lines) {
next if !$line;
$section = $1 if $line =~ m/^\[(\S+)\]$/;
if ($scfg->{type} eq 'rbd') {
if ((!$section) && (!$section =~ m/^$/)) {
warn "Not a proper $scfg->{type} authentication file: $filename\n";
}
} elsif ($scfg->{type} eq 'cephfs') {
if ($section || ($line =~ s/^\s+//)) {
warn "Not a proper $scfg->{type} authentication file: $filename\n";
}
}
}
}
return undef;
};
sub hostlist {
my ($list_text, $separator) = @_;
@ -29,6 +58,10 @@ sub ceph_connect_option {
$cmd_option->{ceph_conf} = $pveceph_config if $pveceph_managed;
if (-e $keyfile) {
$ceph_check_keyfile->($keyfile, $scfg);
}
if (-e $ceph_storeid_conf) {
if ($pveceph_managed) {
warn "ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n";