From 2f843dc81b0c181b2c4da67bf54839d853cfa838 Mon Sep 17 00:00:00 2001 From: Mathew Winstone Date: Wed, 31 Jan 2018 14:49:37 -0500 Subject: [PATCH] refac(lookup) deprecate hiera_hash Use the lookup function Use deep merge --- manifests/init.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index cd0604ca..c77f04d1 100644 --- 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': }