Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Parametrize and increase default of swift-proxy node_timeout"
[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
af6b096
..
152694d
100644
(file)
--- a/
puppet/manifests/overcloud_cephstorage.pp
+++ b/
puppet/manifests/overcloud_cephstorage.pp
@@
-16,14
+16,6
@@
include ::tripleo::packages
include ::tripleo::firewall
include ::tripleo::packages
include ::tripleo::firewall
-if hiera('step') >= 1 {
-
- create_resources(kmod::load, hiera('kernel_modules'), {})
- create_resources(sysctl::value, hiera('sysctl_settings'), {})
- Exec <| tag == 'kmod::load' |> -> Sysctl <| |>
-
-}
-
if hiera('step') >= 4 {
hiera_include('ceph_classes')
}
if hiera('step') >= 4 {
hiera_include('ceph_classes')
}