openstack
/
puppet-ceph
Code Issues Proposed changes

Make sure pg_num is updated before pgp_num. 

We need to order the change because pgp makes a check on the pg
number.

Closes-Bug: #1730457

Change-Id: I2983de1448ce4e4bbbfffb970a1d0f082854d879
This commit is contained in:
Sofer Athlan-Guyot 2017-11-06 17:32:55 +01:00
parent 9fbdb8c905
commit 7a366f92a5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/pool.pp
View File

@ -89,7 +89,7 @@ ceph osd pool set ${name} pgp_num ${pgp_num}",
unless => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
test $(ceph osd pool get ${name} pgp_num | sed 's/.*:\s*//g') -ge ${pgp_num}",
require => Exec["create-${name}"],
require => [Exec["create-${name}"], Exec["set-${name}-pg_num"]],
timeout => $exec_timeout,
}
}

2
spec/defines/ceph_pool_spec.rb
View File

@ -45,7 +45,7 @@ describe 'ceph::pool' do
)
is_expected.to contain_exec('set-volumes-pgp_num').with(
'command' => "/bin/true # comment to satisfy puppet syntax requirements\nset -ex\nceph osd pool set volumes pgp_num 4"
)
).that_requires('Exec[set-volumes-pg_num]')
is_expected.to contain_exec('set-volumes-size').with(
'command' => "/bin/true # comment to satisfy puppet syntax requirements\nset -ex\nceph osd pool set volumes size 2"
)