Composable Timezone service - CephStorage

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_cephstorage.pp

diff --git a/puppet/manifests/overcloud_cephstorage.pp b/puppet/manifests/overcloud_cephstorage.pp
index 4add2f0..2169002 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -22,11 +22,6 @@ if hiera('step') >= 1 {
   create_resources(sysctl::value, hiera('sysctl_settings'), {})
   Exec <| tag == 'kmod::load' |>  -> Sysctl <| |>
 
-  include ::timezone
-
-  if count(hiera('ntp::servers')) > 0 {
-    include ::ntp
-  }
 }
 
 if hiera('step') >= 3 {
@@ -57,5 +52,7 @@ if hiera('step') >= 3 {
   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}