X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_cephstorage.pp;h=7444155c42d887ab8a91bf7da19822c83a362220;hb=fe2133fa8bfface39bdf132b55b692ac349a85e1;hp=cf2626ac7044644e5558c490395f70333e8fabfd;hpb=f441b8ad6f43d6dc29fa9a327a0062684068fab2;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index cf2626ac..7444155c 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,7 +13,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-include tripleo::packages
+include ::tripleo::packages
+include ::tripleo::firewall
 
 create_resources(sysctl::value, hiera('sysctl_settings'), {})
 
@@ -21,7 +22,24 @@ if count(hiera('ntp::servers')) > 0 {
   include ::ntp
 }
 
+include ::timezone
+
+if str2bool(hiera('ceph_osd_selinux_permissive', true)) {
+  exec { 'set selinux to permissive on boot':
+    command => "sed -ie 's/^SELINUX=.*/SELINUX=permissive/' /etc/selinux/config",
+    onlyif  => "test -f /etc/selinux/config && ! grep '^SELINUX=permissive' /etc/selinux/config",
+    path    => ['/usr/bin', '/usr/sbin'],
+  }
+
+  exec { 'set selinux to permissive':
+    command => 'setenforce 0',
+    onlyif  => "which setenforce && getenforce | grep -i 'enforcing'",
+    path    => ['/usr/bin', '/usr/sbin'],
+  } -> Class['ceph::profile::osd']
+}
+
 include ::ceph::profile::client
 include ::ceph::profile::osd
 
-hiera_include('ceph_classes')
\ No newline at end of file
+hiera_include('ceph_classes')
+package_manifest{'/var/lib/tripleo/installed-packages/overcloud_ceph': ensure => present}