From e1b7cfa6bf6d29e61060040678771410bd5c5210 Mon Sep 17 00:00:00 2001 From: szemlyanoy Date: Fri, 5 Jun 2015 11:02:41 +0300 Subject: [PATCH 1/2] merge of hiera hashes from entire hierarchy this should fix the lookup of hash only from the most specific level --- manifests/userparameter.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifests/userparameter.pp b/manifests/userparameter.pp index 834f70336..6f4885994 100644 --- a/manifests/userparameter.pp +++ b/manifests/userparameter.pp @@ -29,7 +29,7 @@ # class zabbix::userparameter ( - $data = {}, + $data = hiera_hash('zabbix::userparameter::data', {}) ) { validate_hash($data) create_resources('zabbix::userparameters', $data) From 78da9daeed6a536ded9e37d45628b4c9ff67cefb Mon Sep 17 00:00:00 2001 From: szemlyanoy Date: Fri, 5 Jun 2015 11:34:38 +0300 Subject: [PATCH 2/2] Update userparameter.pp --- manifests/userparameter.pp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/manifests/userparameter.pp b/manifests/userparameter.pp index 6f4885994..5725556fa 100644 --- a/manifests/userparameter.pp +++ b/manifests/userparameter.pp @@ -28,9 +28,8 @@ # Copyright 2014 Werner Dijkerman # -class zabbix::userparameter ( +class zabbix::userparameter { $data = hiera_hash('zabbix::userparameter::data', {}) -) { validate_hash($data) create_resources('zabbix::userparameters', $data) }