Merge pull request #410 from coldfrontlabs/master

Deprecate hiera_hash functions
voxpupuli · Feb 3, 2018 · 360863f · 360863f
2 parents 9ac0f76 + 2f843dc
commit 360863f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -150,16 +150,16 @@
   $real_fpm_package = pick($fpm_package, "${package_prefix}${::php::params::fpm_package_suffix}")
 
   # Deep merge global php settings
-  $real_settings = deep_merge($settings, hiera_hash('php::settings', {}))
+  $real_settings = deep_merge($settings, lookup('php::settings', {value_type => Hash, merge => 'deep', default_value => {}}))
 
   # Deep merge global php extensions
-  $real_extensions = deep_merge($extensions, hiera_hash('php::extensions', {}))
+  $real_extensions = deep_merge($extensions, lookup('php::extensions', {value_type => Hash, merge => 'deep', default_value => {}}))
 
   # Deep merge fpm_pools
-  $real_fpm_pools = deep_merge($fpm_pools, hiera_hash('php::fpm_pools', {}))
+  $real_fpm_pools = deep_merge($fpm_pools, lookup('php::fpm_pools', {value_type => Hash, merge => 'deep', default_value => {}}))
 
   # Deep merge fpm_global_pool_settings
-  $real_fpm_global_pool_settings = deep_merge($fpm_global_pool_settings, hiera_hash('php::fpm_global_pool_settings', {}))
+  $real_fpm_global_pool_settings = deep_merge($fpm_global_pool_settings, lookup('php::fpm_global_pool_settings', {value_type => Hash, merge => 'deep', default_value => {}}))
 
   if $manage_repos {
     class { '::php::repo': }