Merge "firewall: stop using stdlib stages"
This commit is contained in:
commit
af9c77df80
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue