Identify jump host bridges based on IDF / PDF nets 79/44279/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 16 Sep 2017 01:22:38 +0000 (03:22 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 4 Oct 2017 20:27:53 +0000 (20:27 +0000)
commit1423815e9c0bb31bbb7fba87017bb3a5df75e023
tree4e7a6517b57cdaa29bbf5877360e5d1f0e1ff87d
parent4dcd2f1b46dfe70841e017463166e600a753f19d
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>
(cherry picked from commit 8ec927497b7ee0fd3b7346e957878173b080ef6a)
ci/deploy.sh
mcp/config/labs/local/idf-pod1.yaml [new file with mode: 0644]
mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch [new file with mode: 0644]
mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
mcp/salt-formulas/maas/pxe_route.sls
mcp/scripts/lib.sh
mcp/scripts/net_mcpcontrol.xml.template
mcp/scripts/pharos