openstack
/
puppet-ceph
Code Issues Proposed changes

Merge "Fail deployment if non-existent block devices are passed for OSDs"

This commit is contained in:
Jenkins 2017-03-20 17:20:35 +00:00 committed by Gerrit Code Review
parent 9f52c306e1 7451d6ea29
commit 1360b67c50
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/osd.pp
View File

@ -123,6 +123,7 @@ test -z \$(ceph-disk list ${data} | egrep -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b ${data} ; then
echo ${data} | egrep -e '^/dev' -q -v
mkdir -p ${data}
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph ${data}
@ -156,6 +157,7 @@ ceph-disk list | grep -E ' *${data}1? .*ceph data, (prepared|active)' ||
command => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b ${data} ; then
echo ${data} | egrep -e '^/dev' -q -v
mkdir -p ${data}
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph ${data}

3
releasenotes/notes/osd-check-non-existent-block-device-6f827dba142a3aa5.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Bug 1665697 non-existent block device should make deploy fail, not create directory whose name starts with /dev

4
spec/defines/ceph_osd_spec.rb
View File

@ -46,6 +46,7 @@ test -f /usr/lib/udev/rules.d/95-ceph-osd.rules && test \$DISABLE_UDEV -eq 1
'command' => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b /srv ; then
echo /srv | egrep -e '^/dev' -q -v
mkdir -p /srv
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph /srv
@ -65,6 +66,7 @@ ceph-disk list | grep -E ' */srv1? .*ceph data, (prepared|active)' ||
'command' => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b /srv ; then
echo /srv | egrep -e '^/dev' -q -v
mkdir -p /srv
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph /srv
@ -128,6 +130,7 @@ test -z \$(ceph-disk list /srv/data | egrep -o '[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-
'command' => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b /srv/data ; then
echo /srv/data | egrep -e '^/dev' -q -v
mkdir -p /srv/data
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph /srv/data
@ -147,6 +150,7 @@ ceph-disk list | grep -E ' */srv/data1? .*ceph data, (prepared|active)' ||
'command' => "/bin/true # comment to satisfy puppet syntax requirements
set -ex
if ! test -b /srv/data ; then
echo /srv/data | egrep -e '^/dev' -q -v
mkdir -p /srv/data
if getent passwd ceph >/dev/null 2>&1; then
chown -h ceph:ceph /srv/data