summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorAlex Yang <yangyang1@zte.com.cn>2017-05-31 22:58:44 +0800
committerAlex Yang <yangyang1@zte.com.cn>2017-05-31 22:58:44 +0800
commita6e2199315356be5db8125ad26c2606186ba839c (patch)
tree7aaa7b33d777e9283a42bf8042f7f433776a92d4 /ci
parentd52f2ec25b346cceb9d0a9b400240d4baa0d7bdb (diff)
Remove iptables rules only in virtual deployment
There are error messages "iptables: No chain/target/match by that name" in baremetal deployment: https://build.opnfv.org/ci/job/daisy-deploy-daily-master/298/console Change-Id: I7e2940222fd0a99ee42823a08a285bdd93892fe6 Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy/deploy.sh12
1 files changed, 7 insertions, 5 deletions
diff --git a/ci/deploy/deploy.sh b/ci/deploy/deploy.sh
index e79433a7..acf99dd3 100755
--- a/ci/deploy/deploy.sh
+++ b/ci/deploy/deploy.sh
@@ -369,11 +369,13 @@ fi
echo "====== post deploy ======"
ssh $SSH_PARAS $DAISY_IP "bash $REMOTE_SPACE/deploy/post.sh -n $NETWORK"
-echo "====== disable iptable rules ======"
-sudo iptables -D FORWARD -o daisy1 -j REJECT --reject-with icmp-port-unreachable
-sudo iptables -D FORWARD -i daisy1 -j REJECT --reject-with icmp-port-unreachable
-sudo iptables -D FORWARD -o daisy2 -j REJECT --reject-with icmp-port-unreachable
-sudo iptables -D FORWARD -i daisy2 -j REJECT --reject-with icmp-port-unreachable
+if [ $IS_BARE == 0 ]; then
+ echo "====== disable iptable rules ======"
+ iptables -D FORWARD -o daisy1 -j REJECT --reject-with icmp-port-unreachable
+ iptables -D FORWARD -i daisy1 -j REJECT --reject-with icmp-port-unreachable
+ iptables -D FORWARD -o daisy2 -j REJECT --reject-with icmp-port-unreachable
+ iptables -D FORWARD -i daisy2 -j REJECT --reject-with icmp-port-unreachable
+fi
echo "====== deploy successfully ======"