diff options
Diffstat (limited to 'ci/03-maasdeploy.sh')
| -rwxr-xr-x | ci/03-maasdeploy.sh | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/ci/03-maasdeploy.sh b/ci/03-maasdeploy.sh index c7155284..73b789f1 100755 --- a/ci/03-maasdeploy.sh +++ b/ci/03-maasdeploy.sh @@ -209,14 +209,26 @@ sudo virsh pool-define-as default --type dir --target /var/lib/libvirt/images/ | sudo virsh pool-start default || true 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 || true -sudo virsh net-undefine default || true -sudo virsh net-define net.xml || true -sudo virsh net-autostart default || true -sudo virsh net-start default || true +if [ "$virtinstall" -eq 1 ]; then + sudo virsh net-dumpxml default > default-net-org.xml + sed -i '/dhcp/d' default-net-org.xml + sed -i '/range/d' default-net-org.xml + sudo virsh net-destroy default + sudo virsh net-define default-net-org.xml + sudo virsh net-start default + sudo virsh net-autostart default || true + rm -f default-net-org.xml +else + # 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 || true + sudo virsh net-undefine default || true + sudo virsh net-define net.xml || true + sudo virsh net-autostart default || true + sudo virsh net-start default || true + sudo virsh net-autostart default || true +fi # # Cleanup, juju init and config backup |