diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-11-22 00:59:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-11-22 00:59:08 +0000 |
| commit | af9c77df80accac1f7c78b181c244e32df6b75b8 (patch) | |
| tree | 69e149eb33f5444dee68a9e2074d01c878e2ac44 | |
| parent | 7e623480c475ddf95bc874ed8a3f17000deacbee (diff) | |
| parent | 2ca3cb03ad5f05469e5ae181981e559ccc77371f (diff) | |
Merge "firewall: stop using stdlib stages"
| -rw-r--r-- | manifests/firewall.pp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/manifests/firewall.pp b/manifests/firewall.pp index 3184cd3..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 |