Remove legacy hiera usage and data

Legacy hiera data cause CI failure in acceptance tests. While here, replace calls to hiera() in examples to the corresponding lookup() function.
ccin2p3 · Aug 9, 2023 · 425c3c0 · 425c3c0
1 parent 79221ef
commit 425c3c0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 28 deletions.
diff --git a/examples/OK_ltgt.pp b/examples/OK_ltgt.pp
@@ -37,6 +37,6 @@
   ],
 }
 
-create_resources('patterndb::simple::ruleset', hiera('patterndb::simple::ruleset',{},'patterndb'))
-create_resources('patterndb::simple::rule', hiera('patterndb::simple::rule',{},'patterndb'))
-#create_resources('patterndb::simple::action', hiera('patterndb::simple::action',{},'patterndb'))
+create_resources('patterndb::simple::ruleset', lookup('patterndb::simple::ruleset', undef, undef, {}))
+create_resources('patterndb::simple::rule', lookup('patterndb::simple::rule', undef, undef, {}))
+#create_resources('patterndb::simple::action', lookup('patterndb::simple::action', undef, undef, {}))
diff --git a/manifests/hiera.pp b/manifests/hiera.pp
@@ -4,18 +4,18 @@
 ) {
   create_resources(
     'patterndb::parser',
-    hiera_hash("${prefix}::parser", {})
+    lookup("${prefix}::parser", default_value => {})
   )
   create_resources(
     'patterndb::simple::ruleset',
-    hiera_hash("${prefix}::ruleset",{})
+    lookup("${prefix}::ruleset", default_value => {})
   )
   create_resources(
     'patterndb::simple::rule',
-    hiera_hash("${prefix}::rule", {})
+    lookup("${prefix}::rule", default_value => {})
   )
   create_resources(
     'patterndb::simple::action',
-    hiera_hash("${prefix}::action", {})
+    lookup("${prefix}::action", default_value => {})
   )
 }
diff --git a/spec/acceptance/hieradata/common.yaml b/spec/acceptance/hieradata/common.yaml