diff options
Diffstat (limited to 'manifests/firewall.pp')
| -rw-r--r-- | manifests/firewall.pp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/manifests/firewall.pp b/manifests/firewall.pp index edcb5e7..8c6a53b 100644 --- a/manifests/firewall.pp +++ b/manifests/firewall.pp @@ -51,8 +51,6 @@ class tripleo::firewall( $firewall_post_extras = {}, ) { - include ::stdlib - if $manage_firewall { # Only purges IPv4 rules @@ -79,14 +77,15 @@ class tripleo::firewall( ensure_resource('class', 'tripleo::firewall::pre', { 'firewall_settings' => $firewall_pre_extras, - 'stage' => 'setup', }) ensure_resource('class', 'tripleo::firewall::post', { - 'stage' => 'runtime', 'firewall_settings' => $firewall_post_extras, }) + Class['tripleo::firewall::pre'] -> Class['tripleo::firewall::post'] + Service<||> -> Class['tripleo::firewall::post'] + # Allow composable services to load their own custom # example with Hiera. # NOTE(dprince): In the future when we have a better hiera @@ -102,7 +101,7 @@ class tripleo::firewall( # dport: 999 # proto: udp # action: accept - $service_names = reject(hiera('service_names', []), '^$') + $service_names = hiera('service_names', []) tripleo::firewall::service_rules { $service_names: } } |