summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-28 17:46:08 +0000
committerGerrit Code Review <review@openstack.org>2017-03-28 17:46:08 +0000
commit21c5ff30bb8a54913baf6c31dd83f54ad5596ccd (patch)
treeda810572460bf9790c1031ec0e6b6dfdc464fa78
parentf6fb2e4d2b7533f81a27e4f7e4b213cbb0dc956c (diff)
parent670399a2caeecd9259bea454e9518ab6c92cff49 (diff)
Merge "N->O upgrade, blanks ipv6 rules before activating it."
-rw-r--r--puppet/services/tripleo-firewall.yaml6
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