From: Michael Polenchuk <mpolenchuk@mirantis.com>
Date: Thu, 13 Sep 2018 09:58:38 +0000 (+0000)
Subject: Revert "fuel-deploy: Add temporary iptables rule"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=commitdiff_plain;h=0b6648eae7800cb0f71e447c47f62c75c17b20ed

Revert "fuel-deploy: Add temporary iptables rule"

This reverts commit b4a65c5e6777a53be5ea817c967caeee51285a7f.
Chain of DOCKER-ISOLATION already has required rule.

Change-Id: Ic7d3e93a2814a42764b4822ef96e0841f68b774d
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
---

diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index a4b40f44f..433061a96 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -111,15 +111,6 @@ echo
 ${DEPLOY_COMMAND}
 exit_code=$?
 
-# Temporary workaround for ericsson-virtual* PODs functest integration
-# See https://jira.opnfv.org/browse/FUNCTEST-985
-# Set iptables rule to allow forwarding return traffic for container
-redirect=/dev/stdout
-if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || \
-   ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
-     sudo iptables -I FORWARD -j RETURN
-fi
-
 echo
 echo "--------------------------------------------------------"
 echo "Deployment is done!"