From: Narinder Gupta <narinder.gupta@canonical.com>
Date: Sat, 31 Mar 2018 08:41:18 +0000 (-0500)
Subject: modfiied to use admin as default for VM.
X-Git-Tag: opnfv-6.0.0~2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a9e23db8ba3033392ccd8cfb8ac50b6b9921ec48;p=joid.git

modfiied to use admin as default for VM.

Change-Id: I22aef2a36ae7ba08681c1c202d20726d1a605ad1
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
---

diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh
index ab144a5f..869d97e4 100755
--- a/ci/03-maasdeploy.sh
+++ b/ci/03-maasdeploy.sh
@@ -212,9 +212,10 @@ sudo virsh pool-autostart default || true
 # As we use kvm so setup network on admin network
 ADMIN_BR=`cat labconfig.json | jq '.opnfv.spaces[] | select(.type=="admin")'.bridge | cut -d \" -f 2 `
 sed -i "s@brAdm@$ADMIN_BR@" net.xml
-sudo virsh net-destroy default
-sudo virsh net-define net.xml
-sudo virsh net-start default
+sudo virsh net-destroy default || true
+sudo virsh net-undefine default || true
+sudo virsh net-define net.xml || true
+sudo virsh net-start default || true
 
 #
 # Cleanup, juju init and config backup