From 7a366f92a53cc9015d3aaeab86e36c3d1649cf79 Mon Sep 17 00:00:00 2001 From: Sofer Athlan-Guyot Date: Mon, 6 Nov 2017 17:32:55 +0100 Subject: [PATCH] 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 --- manifests/pool.pp | 2 +- spec/defines/ceph_pool_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/pool.pp b/manifests/pool.pp index 40675406..2d0df203 100644 --- a/manifests/pool.pp +++ b/manifests/pool.pp @@ -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, } } diff --git a/spec/defines/ceph_pool_spec.rb b/spec/defines/ceph_pool_spec.rb index 490e22d5..1510ea1f 100644 --- a/spec/defines/ceph_pool_spec.rb +++ b/spec/defines/ceph_pool_spec.rb @@ -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" )