Identify jump host bridges based on IDF / PDF nets

- minor refactor of runtime templates parsing to allow var expansion;
- parse <pod_config.yml> into shell vars, match dynamically networks
  from PDF to IP addresses on bridges of current jumphost;
- keep old '-B' parameter in <ci/deploy.sh>, use it for providing
  fallback values in case there's no bridge name specified via IDF
  and no IP on the jumphost for one or more of the PDF networks;
- re-enable dry-run to ease testing of the above;
- add sample 'idf-pod1.yaml' to <mcp/config/labs/local>;

The new behavior will try to determine the jump host bridge names:
1. Based on IDF mapping, if available
2. Based on PDF network matching with IP addrs on jumphost;
3. Fallback to values passed via '-B';
4. Fallback to default values hardcoded in the deploy script;

Later, we will drop MaaS network env vars in favor of PDF vars,
once the PDF template is generating them.

Change-Id: If9cd65d310c02965b2e2bfa06a0d7e0f97f1dd48
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

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