From d41cbd9b1b71a7b61e93665c2579ff292216025d Mon Sep 17 00:00:00 2001
From: "Manoj Alva(ma257n)" <ma257n@att.com>
Date: Thu, 3 Jun 2021 17:25:57 +0000
Subject: [PATCH] Removal of IPTable rules in vm-infra-bridge manifests.

Change in the vino networking model to accomodate pxe network
(https://review.opendev.org/c/airship/vino/+/793652) has made the iptables
update in the vm-infra-bridge manifesst unnecessary.
This PS removes the iptables related entries.

Change-Id: I0eb530b17302f34c3eaee83ca6fd454c665f7e73
---
 manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml   | 4 ----
 .../function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml b/manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml
index 14adec935..40b0d4dc5 100644
--- a/manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml
+++ b/manifests/function/k8scontrol-vm-infra/vm-infra-bridge.yaml
@@ -61,8 +61,4 @@
            ip addr add  ${vm_infra_ip_address}${vm_infra_ip_cidr} dev vm-infra-bridge
            brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF
       fi;
-      # add forwarding rule for vm-infra-bridge
-      iptables -A FORWARD -i vm-infra-bridge -j ACCEPT
-      # add iptables postrouting nat
-      iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_infra_ip_cidr} -o REPLACEMENT_MGMT_INTF -j MASQUERADE
       exit 0
diff --git a/manifests/function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml b/manifests/function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml
index 7478f615b..a6ca2948b 100644
--- a/manifests/function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml
+++ b/manifests/function/vm-infra-bridge/dataplane/vm-infra-bridge.yaml
@@ -61,8 +61,4 @@
            ip addr add  ${vm_infra_ip_address}${vm_infra_ip_cidr} dev vm-infra-bridge
            brctl addif vm-infra-bridge REPLACEMENT_VM_INFRA_INTF
       fi;
-      # add forwarding rule for vm-infra-bridge
-      iptables -A FORWARD -i vm-infra-bridge -j ACCEPT
-      # add iptables postrouting nat
-      iptables -t nat -A POSTROUTING -s REPLACEMENT_VM_NETWORK${vm_infra_ip_cidr} -o REPLACEMENT_MGMT_INTF -j MASQUERADE
       exit 0