proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-05 12:30:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set correct keyring location for osd

Browse Source
This commit is contained in:
Dietmar Maurer 2013-11-21 09:11:02 +01:00
parent 8214fc6f21
commit 88a6e29ad1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PVE/API2/Ceph.pm
View File

@ -542,8 +542,6 @@ __PACKAGE__->register_method ({
# simply load old config if it already exists
my $cfg = &$parse_ceph_config($pve_ceph_cfgpath);
my $keyring = '/etc/pve/priv/$cluster.$name.keyring';
if (!$cfg->{global}) {
my $fsid;
@ -568,7 +566,8 @@ __PACKAGE__->register_method ({
#'osd pool default pgp num' => $pg_num,
}
$cfg->{global}->{keyring} = $keyring;
$cfg->{global}->{keyring} = '/etc/pve/priv/$cluster.$name.keyring';
$cfg->{osd}->{keyring} = "/var/lib/ceph/osd/ceph-$id/keyring";
$cfg->{global}->{'osd pool default size'} = $param->{size} if $param->{size};