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
Enable Cisco Nexus and UCSM plugins
[apex-tripleo-heat-templates.git]
/
puppet
/
manifests
/
overcloud_volume.pp
diff --git
a/puppet/manifests/overcloud_volume.pp
b/puppet/manifests/overcloud_volume.pp
index
f5c9ae5
..
d1f6d6a
100644
(file)
--- a/
puppet/manifests/overcloud_volume.pp
+++ b/
puppet/manifests/overcloud_volume.pp
@@
-13,16
+13,7
@@
# License for the specific language governing permissions and limitations
# under the License.
# License for the specific language governing permissions and limitations
# under the License.
-if str2bool(hiera('disable_package_install', 'false')) {
- case $::osfamily {
- 'RedHat': {
- Package { provider => 'norpm' } # provided by tripleo-puppet
- }
- default: {
- warning('disable_package_install option not supported.')
- }
- }
-}
+include tripleo::packages
create_resources(sysctl::value, hiera('sysctl_settings'), {})
create_resources(sysctl::value, hiera('sysctl_settings'), {})