aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/patches/pharos
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-04 20:27:47 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-10-04 20:27:47 +0000
commit61b418dd534fe09e2550248d6d909a2399a18d27 (patch)
tree4e7a6517b57cdaa29bbf5877360e5d1f0e1ff87d /mcp/patches/pharos
parenta05f8d2682f2449d7d10e52038c56a0af6357def (diff)
parent8ec927497b7ee0fd3b7346e957878173b080ef6a (diff)
Merge "Identify jump host bridges based on IDF / PDF nets"
Diffstat (limited to 'mcp/patches/pharos')
-rw-r--r--mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch27
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') }}