openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "firewall: stop using stdlib stages"

This commit is contained in:
Jenkins 2016-11-22 00:59:08 +00:00 committed by Gerrit Code Review
parent 7e623480c4 2ca3cb03ad
commit af9c77df80
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/firewall.pp
View File

@ -51,8 +51,6 @@ class tripleo::firewall(
$firewall_post_extras = {}, $firewall_post_extras = {},
) { ) {
include ::stdlib
if $manage_firewall { if $manage_firewall {
# Only purges IPv4 rules # Only purges IPv4 rules
@ -79,14 +77,15 @@ class tripleo::firewall(
ensure_resource('class', 'tripleo::firewall::pre', { ensure_resource('class', 'tripleo::firewall::pre', {
'firewall_settings' => $firewall_pre_extras, 'firewall_settings' => $firewall_pre_extras,
'stage' => 'setup',
}) })
ensure_resource('class', 'tripleo::firewall::post', { ensure_resource('class', 'tripleo::firewall::post', {
'stage' => 'runtime',
'firewall_settings' => $firewall_post_extras, '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 # Allow composable services to load their own custom
# example with Hiera. # example with Hiera.
# NOTE(dprince): In the future when we have a better hiera # NOTE(dprince): In the future when we have a better hiera