Merge "Optimize Nova disk_cachemodes and hw_disk_discard options for RBD"

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

diff --git a/puppet/manifests/overcloud_object.pp b/puppet/manifests/overcloud_object.pp
index eb4e968..ae07458 100644 (file)
--- a/puppet/manifests/overcloud_object.pp
+++ b/puppet/manifests/overcloud_object.pp
@@ -16,12 +16,16 @@
 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
+
 include ::swift
 class { '::swift::storage::all':
   mount_check => str2bool(hiera('swift_mount_check')),