openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Fix lspool issues on Mimic"

This commit is contained in:
Zuul 2018-06-29 16:40:33 +00:00 committed by Gerrit Code Review
parent 2b25cbfb1b 72235f18aa
commit 2dbb4ff11c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/pool.pp
View File

@ -66,7 +66,7 @@ set -ex
ceph osd pool create ${name} ${pg_num}",
unless => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
ceph osd lspools | grep ' ${name},'",
ceph osd pool ls | grep -w '${name}'",
timeout => $exec_timeout,
}
@ -115,7 +115,7 @@ set -ex
ceph osd pool delete ${name} ${name} --yes-i-really-really-mean-it",
onlyif => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
ceph osd lspools | grep ${name}",
ceph osd pool ls | grep -w '${name}'",
timeout => $exec_timeout,
} -> Ceph::Mon<| ensure == absent |>