From 66788c687113e07da748953f1cf46bc5b3d76273 Mon Sep 17 00:00:00 2001 From: adria Date: Thu, 7 Jan 2016 10:56:39 +0100 Subject: [PATCH] Convert rule.pp from class to define so we can instantiate it multiple times --- manifests/init.pp | 5 ++--- manifests/rule.pp | 7 +++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/manifests/init.pp b/manifests/init.pp index 65ded4f..0ad7fef 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -25,9 +25,8 @@ in_policy => $in_policy, out_policy => $out_policy, }-> - class { 'windows_firewall::rule': - rule_key => $rule_key, - }-> + windows_firewall::rule { $rule_key: } + resources { 'firewall_rule': purge => $purge_rules, } diff --git a/manifests/rule.pp b/manifests/rule.pp index 4d8b254..a305b4f 100644 --- a/manifests/rule.pp +++ b/manifests/rule.pp @@ -1,6 +1,5 @@ #Applies rules in hiera under specified key name. -class windows_firewall::rule( - $rule_key = 'windows_networks', +define windows_firewall::rule( ) { $defaults = { protocol => 6, @@ -22,5 +21,5 @@ action => 1, edge_traversal_options => 0, } - create_resources(firewall_rule, hiera_hash($rule_key), $defaults) -} \ No newline at end of file + create_resources(firewall_rule, hiera_hash($title), $defaults) +}