diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-30 11:06:25 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-30 11:06:25 +0000 |
| commit | 48cb9c2f74cec3dd24e50bf38f33ed9181c347b4 (patch) | |
| tree | 6ff6eec7e2abcdd2e524429442bdc4632fd3b3be /puppet/services | |
| parent | 28202dc7589bcc18e4f398e9dc00a4095bc45a68 (diff) | |
| parent | 440901b5026d0927ce74ab358fbe3d430f91b38a (diff) | |
Merge "N->O upgrade, blanks ipv6 rules before activating it." into stable/ocata
Diffstat (limited to 'puppet/services')
| -rw-r--r-- | puppet/services/tripleo-firewall.yaml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/puppet/services/tripleo-firewall.yaml b/puppet/services/tripleo-firewall.yaml index 67e14d9c..ff2b067f 100644 --- a/puppet/services/tripleo-firewall.yaml +++ b/puppet/services/tripleo-firewall.yaml @@ -37,3 +37,9 @@ outputs: tripleo::firewall::purge_firewall_rules: {get_param: PurgeFirewallRules} step_config: | include ::tripleo::firewall + upgrade_tasks: + - name: blank ipv6 rule before activating ipv6 firewall. + tags: step3 + shell: cat /etc/sysconfig/ip6tables > /etc/sysconfig/ip6tables.n-o-upgrade; cat</dev/null>/etc/sysconfig/ip6tables + args: + creates: /etc/sysconfig/ip6tables.n-o-upgrade |