diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-04 20:27:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-10-04 20:27:47 +0000 |
| commit | 61b418dd534fe09e2550248d6d909a2399a18d27 (patch) | |
| tree | 4e7a6517b57cdaa29bbf5877360e5d1f0e1ff87d /mcp/scripts | |
| parent | a05f8d2682f2449d7d10e52038c56a0af6357def (diff) | |
| parent | 8ec927497b7ee0fd3b7346e957878173b080ef6a (diff) | |
Merge "Identify jump host bridges based on IDF / PDF nets"
Diffstat (limited to 'mcp/scripts')
| -rw-r--r-- | mcp/scripts/lib.sh | 8 | ||||
| -rw-r--r-- | mcp/scripts/net_mcpcontrol.xml.template | 4 | ||||
| m--------- | mcp/scripts/pharos | 0 |
3 files changed, 3 insertions, 9 deletions
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh index dc4d9dc2f..fcc5d76ac 100644 --- a/mcp/scripts/lib.sh +++ b/mcp/scripts/lib.sh @@ -103,13 +103,7 @@ create_vms() { vnode_networks[2]="${vnode_networks[0]}" fi for net in "${vnode_networks[@]:1}"; do - net_type="bridge" - # in case of custom network, host should already have the bridge in place - 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" + net_args="${net_args} --network bridge=${net},model=virtio" done # shellcheck disable=SC2086 diff --git a/mcp/scripts/net_mcpcontrol.xml.template b/mcp/scripts/net_mcpcontrol.xml.template index 722a66aa9..ab58851e8 100644 --- a/mcp/scripts/net_mcpcontrol.xml.template +++ b/mcp/scripts/net_mcpcontrol.xml.template @@ -2,9 +2,9 @@ <name>mcpcontrol</name> <bridge name="mcpcontrol"/> <forward mode="nat"/> - <ip address="${MCP_CTRL_NETWORK_ROOTSTR}.1" netmask="255.255.255.0"> + <ip address="${SALT_MASTER%.*}.1" netmask="255.255.255.0"> <dhcp> - <range start="${MCP_CTRL_NETWORK_ROOTSTR}.2" end="${MCP_CTRL_NETWORK_ROOTSTR}.254"/> + <range start="${SALT_MASTER%.*}.2" end="${SALT_MASTER%.*}.254"/> </dhcp> </ip> </network> diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos -Subproject 908dab58edbbe8f22db14a9261693a54e9b2d8f +Subproject 2c4fac2e41aaca9dd679b200ffc968eeb448b39 |