From: meimei <meimei@huawei.com>
Date: Thu, 21 Jan 2016 03:16:21 +0000 (+0800)
Subject: don't create external network when we have onos
X-Git-Tag: brahmaputra.1.0~153
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=39b1b26786cb1f576c3ca6b0646089cf26e70a03;p=releng.git

don't create external network when we have onos
because onos will create ext-net itself

Change-Id: If7b080f1a53b62af1ce50d5140adcd557810e846
Signed-off-by: meimei <meimei@huawei.com>
---

diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
index 991a2bc5a..c0fdfe512 100644
--- a/jjb/joid/joid-deploy.sh
+++ b/jjb/joid/joid-deploy.sh
@@ -199,6 +199,8 @@ exit_on_error $? "Deploy FAILED to auth to openstack"
 # If we have more information than only the name, try to create it
 if [ -z "$EXTNET_TYPE" ]; then
     echo "------ No data for external network creation, pass ------"
+elif [[ "$DEPLOY_SCENARIO" =~ "onos" ]]; then
+    echo "------ ONOS have created the external network, pass ------"
 else
     echo "------ External network creation ------"
     neutron net-create $EXTNET_NAME --router:external True \