openstack
/
puppet-ceph
Code Issues Proposed changes

Fix the logic to skip SELinux labeling of block devices 

Previously the unless clause was cusing the SELinux label to
happen for block devices too.

Closes-Bug: 1617310
Change-Id: I4ab32e5f796609cf2f985e989c6dc04d0eb37190
This commit is contained in:
Giulio Fidente 2016-08-26 15:00:00 +02:00
parent 4e36628a02
commit 309ef4819b
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/osd.pp
View File

@ -118,7 +118,7 @@ ceph-disk list | grep -E ' *${data}1? .*ceph data, (prepared|active)' ||
path => ['/usr/sbin', '/sbin', '/usr/bin', '/bin'],
require => [Package[$::ceph::params::pkg_policycoreutils],Exec[$ceph_prepare]],
before => Exec[$ceph_activate],
unless => "test ! -b ${data} && (semanage fcontext -l | grep ${data})",
unless => "test -b ${data} || (semanage fcontext -l | grep ${data})",
}
}