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

ceph config: minor code cleanup & comment

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht
2022-04-26 12:47:54 +02:00
parent 34fd49a69b
commit 428872eb71
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/CephConfig.pm
View File

@ -178,21 +178,20 @@ sub ceph_connect_option {
my ($scfg, $storeid, %options) = @_; my ($scfg, $storeid, %options) = @_;
my $cmd_option = {}; my $cmd_option = {};
my $ceph_storeid_conf = "/etc/pve/priv/ceph/${storeid}.conf";
my $pveceph_config = '/etc/pve/ceph.conf';
my $keyfile = "/etc/pve/priv/ceph/${storeid}.keyring"; my $keyfile = "/etc/pve/priv/ceph/${storeid}.keyring";
$keyfile = "/etc/pve/priv/ceph/${storeid}.secret" if ($scfg->{type} eq 'cephfs'); $keyfile = "/etc/pve/priv/ceph/${storeid}.secret" if ($scfg->{type} eq 'cephfs');
my $pveceph_managed = !defined($scfg->{monhost}); my $pveceph_managed = !defined($scfg->{monhost});
$cmd_option->{ceph_conf} = $pveceph_config if $pveceph_managed; $cmd_option->{ceph_conf} = '/etc/pve/ceph.conf' if $pveceph_managed;
$ceph_check_keyfile->($keyfile, $scfg->{type}); $ceph_check_keyfile->($keyfile, $scfg->{type});
if (-e $ceph_storeid_conf) { if (-e "/etc/pve/priv/ceph/${storeid}.conf") {
# allow custom ceph configuration for external clusters
if ($pveceph_managed) { if ($pveceph_managed) {
warn "ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n"; warn "ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n";
} else { } else {
$cmd_option->{ceph_conf} = $ceph_storeid_conf; $cmd_option->{ceph_conf} = "/etc/pve/priv/ceph/${storeid}.conf";
} }
} }