1 files changed, 4 insertions, 36 deletions
diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index fd7faff1..df83496f 100644
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -16,41 +16,9 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-create_resources(kmod::load, hiera('kernel_modules'), {})
-create_resources(sysctl::value, hiera('sysctl_settings'), {})
-Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
-
-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']
-}
-
-if str2bool(hiera('ceph_ipv6', false)) {
-  $mon_host = hiera('ceph_mon_host_v6')
-} else {
-  $mon_host = hiera('ceph_mon_host')
-}
-class { '::ceph::profile::params':
-  mon_host            => $mon_host,
+if hiera('step') >= 4 {
+  hiera_include('ceph_classes', [])
 }
-include ::ceph::conf
-include ::ceph::profile::client
-include ::ceph::profile::osd
 
-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}