From d93cd7d0c0e6bc813ab2bb9dc0809b8cc9bd5543 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Wed, 1 Jun 2022 17:21:52 -0400 Subject: [PATCH] migration: Delete also SGRs for IPv6 IPv4 and IPv6 have different utility in iptables. This patch adds use of ip6tables the same way as previously used iptables. Change-Id: I1e8ef2749ac5705563e539a5e9f02c63347b5dbe Signed-off-by: Jakub Libosvar --- .../roles/migration/tasks/cleanup-dataplane.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/cleanup-dataplane.yml b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/cleanup-dataplane.yml index d6e3b850c14..91c90d470b8 100644 --- a/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/cleanup-dataplane.yml +++ b/tools/ovn_migration/tripleo_environment/playbooks/roles/migration/tasks/cleanup-dataplane.yml @@ -42,16 +42,21 @@ - name: Clean neutron datapath security groups from iptables shell: | - iptables-save > /tmp/iptables-before-cleanup + {{ iptables_exec }}-save > /tmp/iptables-before-cleanup cat /tmp/iptables-before-cleanup | grep -v neutron-openvswi | \ grep -v neutron-filter > /tmp/iptables-after-cleanup if ! cmp /tmp/iptables-before-cleanup /tmp/iptables-after-cleanup then - cat /tmp/iptables-after-cleanup | iptables-restore + cat /tmp/iptables-after-cleanup | {{ iptables_exec }}-restore echo "Security groups cleaned" fi register: out + with_items: + - iptables + - ip6tables + loop_control: + loop_var: iptables_exec changed_when: "'Security groups cleaned' in out.stdout" - name: Cleanup neutron datapath resources