Issue 3638 - Introduce class adblockplus::host

modules/adblockplus/manifests/init.pp

Index: modules/adblockplus/manifests/init.pp
diff --git a/modules/adblockplus/manifests/init.pp b/modules/adblockplus/manifests/init.pp
index c887d6471b20d1249917a0961cc0a673e2e9e52e..69fb8c9370daa7abe5ebd10201f91615a1d2071f 100644
--- a/modules/adblockplus/manifests/init.pp
+++ b/modules/adblockplus/manifests/init.pp
@@ -10,6 +10,10 @@
 #   The authorative domain or zone associated with the current environment,
 #   similar to the deprecated and soon to be removed $base::zone.
 #
+# [*hosts*]
+#   A hash of adblockplus::host $name => $parameter items to set up in this
+#   context, i.e. via Hiera.
+#
 # [*users*]
 #   A hash of adblockplus::user $name => $parameter items to set up in this
 #   context, i.e. via Hiera.
@@ -17,6 +21,11 @@
 # === Examples:
 #
 #   class {'adblockplus':
+#     hosts => {
+#       'node1' => {
+#         # see adblockplus::host
+#       },
+#     },
 #     users => {
 #       'pinocchio' => {
 #         # see adblockplus::user
@@ -26,6 +35,7 @@
 #
 class adblockplus (
   $authority = hiera('adblockplus::authority', 'adblockplus.org'),
+  $hosts = hiera_hash('adblockplus::hosts', hiera('servers', {})),
   $users = hiera_hash('adblockplus::users', {}),
 ) {
 
@@ -45,6 +55,9 @@ class adblockplus (
     owner => 'root',
   }
 
+  # See modules/adblockplus/manifests/host.pp
+  create_resources('adblockplus::host', $hosts)
+
   # See modules/adblockplus/manifests/user.pp
   create_resources('adblockplus::user', $users)
 }