Merge "[baremetal] MaaS: Remove curtin netconfig via Salt"
[fuel.git] / mcp / patches / pharos / 0001-Add-IDF-mappings-to-installer-adapter.patch
1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Mirantis Inc., Enea AB and others.
3 :
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Tue, 3 Oct 2017 02:41:41 +0200
11 Subject: [PATCH] Add IDF mappings to installer adapter
12
13 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
14 ---
15  config/installers/fuel/pod_config.yml.j2 | 7 +++++++
16  1 file changed, 7 insertions(+)
17
18 diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
19 index c2f1403..19e5d0d 100644
20 --- a/config/installers/fuel/pod_config.yml.j2
21 +++ b/config/installers/fuel/pod_config.yml.j2
22 @@ -26,6 +26,13 @@
23  parameters:
24    _param:
25
26 +{%- if conf.idf is defined %}
27 +    opnfv_jump_bridge_admin: {{ conf['idf']['fuel']['jumphost']['bridges']['admin'] }}
28 +    opnfv_jump_bridge_mgmt: {{ conf['idf']['fuel']['jumphost']['bridges']['mgmt'] }}
29 +    opnfv_jump_bridge_private: {{ conf['idf']['fuel']['jumphost']['bridges']['private'] }}
30 +    opnfv_jump_bridge_public: {{ conf['idf']['fuel']['jumphost']['bridges']['public'] }}
31 +{%- endif %}
32 +
33      opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
34      opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
35      opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}