From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 27 Sep 2017 19:18:00 +0000 (+0000)
Subject: Merge "PDF parsing support"
X-Git-Tag: opnfv-6.0.0~344
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3a3a7081c3b38ff0ec95c1c65eca152af0900fb8;hp=36e4b9754dedef27637c09b510829f686bd469e4;p=fuel.git

Merge "PDF parsing support"
---

diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 4b88ab7bb..dc4d9dc2f 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -72,7 +72,7 @@ create_networks() {
       virsh net-undefine "${net}"
     fi
     # in case of custom network, host should already have the bridge in place
-    if [ -f "net_${net}.xml" ]; then
+    if [ -f "net_${net}.xml" ] && [ ! -d "/sys/class/net/${net}/bridge" ]; then
       virsh net-define "net_${net}.xml"
       virsh net-autostart "${net}"
       virsh net-start "${net}"
@@ -103,10 +103,11 @@ create_vms() {
       vnode_networks[2]="${vnode_networks[0]}"
     fi
     for net in "${vnode_networks[@]:1}"; do
-      net_type="network"
+      net_type="bridge"
       # in case of custom network, host should already have the bridge in place
-      if [ ! -f "net_${net}.xml" ]; then
-        net_type="bridge"
+      if [ -f "net_${net}.xml" ] && \
+         [ ! -d "/sys/class/net/${net}/bridge" ]; then
+        net_type="network"
       fi
       net_args="${net_args} --network ${net_type}=${net},model=virtio"
     done