Skip to content

P
pve-manager
Commit 3712e45b authored by Dietmar Maurer's avatar Dietmar Maurer
Browse files
Options

set correct keyring location for osd

parent 9deef998
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
PVE/API2/Ceph.pm
View file @ 3712e45b
...@@ -542,8 +542,6 @@ __PACKAGE__->register_method ({ ...@@ -542,8 +542,6 @@ __PACKAGE__->register_method ({
# simply load old config if it already exists # simply load old config if it already exists
my $cfg = &$parse_ceph_config($pve_ceph_cfgpath); my $cfg = &$parse_ceph_config($pve_ceph_cfgpath);
my $keyring = '/etc/pve/priv/$cluster.$name.keyring';
if (!$cfg->{global}) { if (!$cfg->{global}) {
my $fsid; my $fsid;
...@@ -568,7 +566,8 @@ __PACKAGE__->register_method ({ ...@@ -568,7 +566,8 @@ __PACKAGE__->register_method ({
#'osd pool default pgp num' => $pg_num, #'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}; $cfg->{global}->{'osd pool default size'} = $param->{size} if $param->{size};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023