diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-26 20:52:36 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-27 12:47:02 +0000 |
| commit | 51be444a4239ed10f47d4e63b70ac13d109f07cd (patch) | |
| tree | be57bc526232b34b11813749a140293f4cc1e16a | |
| parent | a27ad89c0d97ff1be7f40af51b59df8d26dc7fe4 (diff) | |
lib.sh: Use host bridge in favor of virsh network
If a linux bridge already exists on the jump host, with the same
name as the value passed via `-B` or the default, use it instead
of trying to create a virsh network.
Change-Id: If7f0753ec366d429ff101c2b37dd68f895903404
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 96cccf2b507949978c1b37c65961a5182ffbbbfd)
| -rw-r--r-- | mcp/scripts/lib.sh | 9 |
1 files changed, 5 insertions, 4 deletions
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 |