X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_cephstorage.pp;h=af6b0960fe0cff72455c124a6883429aa197d20a;hb=794fece5cc25d74ca0d874174e2c837a15750fbf;hp=7f8970cc16e4d0905100d5af33a32c69d61763d1;hpb=d35f067ce1dc0bf48251f89cd1dcdeecbf35cc17;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 7f8970cc..af6b0960 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -16,28 +16,17 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-create_resources(sysctl::value, hiera('sysctl_settings'), {})
+if hiera('step') >= 1 {
 
-if count(hiera('ntp::servers')) > 0 {
-  include ::ntp
-}
-
-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'],
-  }
+  create_resources(kmod::load, hiera('kernel_modules'), {})
+  create_resources(sysctl::value, hiera('sysctl_settings'), {})
+  Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
-  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
+if hiera('step') >= 4 {
+  hiera_include('ceph_classes')
+}
 
-hiera_include('ceph_classes')
-package_manifest{'/var/lib/tripleo/installed-packages/overcloud_ceph': ensure => present}
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}