Merge "Ensure SELinux is permissive on Ceph OSDs"

diff --cc puppet/manifests/overcloud_cephstorage.pp
index cf2626a,38b6a54..6c5dda4
--- 1/puppet/manifests/overcloud_cephstorage.pp
--- 2/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@@ -24,4 -47,4 +38,4 @@@ if str2bool(hiera('ceph_osd_selinux_per
  include ::ceph::profile::client
  include ::ceph::profile::osd
  
--hiera_include('ceph_classes')
++hiera_include('ceph_classes')

diff --cc puppet/manifests/overcloud_controller.pp
Simple merge

diff --cc puppet/manifests/overcloud_controller_pacemaker.pp
Simple merge