Merge "Restore the NtpServer parameter name"

[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 21fd5f9..152694d 100644 (file)
--- a/puppet/manifests/overcloud_cephstorage.pp
+++ b/puppet/manifests/overcloud_cephstorage.pp
@@ -13,24 +13,12 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-if !str2bool(hiera('enable_package_install', 'false')) {
-  case $::osfamily {
-    'RedHat': {
-      Package { provider => 'norpm' } # provided by tripleo-puppet
-    }
-    default: {
-      warning('enable_package_install option not supported.')
-    }
-  }
-}
-
-create_resources(sysctl::value, hiera('sysctl_settings'), {})
+include ::tripleo::packages
+include ::tripleo::firewall
 
-if count(hiera('ntp::servers')) > 0 {
-  include ::ntp
+if hiera('step') >= 4 {
+  hiera_include('ceph_classes')
 }
 
-include ::ceph::profile::client
-include ::ceph::profile::osd
-
-hiera_include('ceph_classes')
\ No newline at end of file
+$package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_ceph', hiera('step')])
+package_manifest{$package_manifest_name: ensure => present}