diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-16 03:22:38 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-03 18:41:20 +0200 |
| commit | 8ec927497b7ee0fd3b7346e957878173b080ef6a (patch) | |
| tree | 2f2daf184b59ba934e95986e1dddbc27932eb96d /mcp/patches/pharos | |
| parent | 0c00f813d709fd1b65e5dd52abcf16fd81b3d0e1 (diff) | |
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>
Diffstat (limited to 'mcp/patches/pharos')
| -rw-r--r-- | mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch new file mode 100644 index 000000000..59a0e975a --- /dev/null +++ b/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch @@ -0,0 +1,27 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +Date: Tue, 3 Oct 2017 02:41:41 +0200 +Subject: [PATCH] Add IDF mappings to installer adapter + +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +--- + config/installers/fuel/pod_config.yml.j2 | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 +index 99434f9..676ead3 100644 +--- a/config/installers/fuel/pod_config.yml.j2 ++++ b/config/installers/fuel/pod_config.yml.j2 +@@ -26,6 +26,13 @@ + parameters: + _param: + ++{%- if conf.idf is defined %} ++ opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }} ++ opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }} ++ opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }} ++ opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }} ++{%- endif %} ++ + opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }} + opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }} + opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }} |