my $ceph_cfgdir = "/etc/ceph";
my $pve_ceph_cfgpath = "/etc/pve/$ccname.conf";
my $ceph_cfgpath = "$ceph_cfgdir/$ccname.conf";
+my $pve_ceph_cfgdir = "/etc/pve/ceph";
my $pve_mon_key_path = "/etc/pve/priv/$ccname.mon.keyring";
my $pve_ckeyring_path = "/etc/pve/priv/$ccname.client.admin.keyring";
my $config_values = {
ccname => $ccname,
+ pve_ceph_cfgdir => $pve_ceph_cfgdir,
ceph_mds_data_dir => $ceph_mds_data_dir,
long_rados_timeout => 60,
};
return undef if !check_ceph_installed('ceph_mon', $noerr);
- if (! -f $pve_ceph_cfgpath) {
- die "pveceph configuration not initialized\n" if !$noerr;
+ my @errors;
+
+ push(@errors, "missing '$pve_ceph_cfgpath'") if ! -f $pve_ceph_cfgpath;
+ push(@errors, "missing '$pve_ceph_cfgdir'") if ! -d $pve_ceph_cfgdir;
+
+ if (@errors) {
+ my $err = 'pveceph configuration not initialized - ' . join(', ', @errors) . "\n";
+ die $err if !$noerr;
return undef;
}