From 33d945e3045f68ea7cbd2f1b8d01618cb3fed23c Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Mon, 11 Dec 2017 19:15:15 +0100 Subject: patches: pharos: Bump & drop upstream patches All our staged patches for Pharos repo are now upstream, so bump the git submodule and remove the patch files. Change-Id: I0d68eb3bdd9abfa286c3640acc1f13ce6100801d Signed-off-by: Alexandru Avadanii --- ...001-Add-IDF-mappings-to-installer-adapter.patch | 35 ---------------------- 1 file changed, 35 deletions(-) delete mode 100644 mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch (limited to 'mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch') 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 deleted file mode 100644 index 4c3693bf5..000000000 --- a/mcp/patches/pharos/0001-Add-IDF-mappings-to-installer-adapter.patch +++ /dev/null @@ -1,35 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: Copyright (c) 2017 Mirantis Inc., Enea AB and others. -: -: All rights reserved. This program and the accompanying materials -: are made available under the terms of the Apache License, Version 2.0 -: which accompanies this distribution, and is available at -: http://www.apache.org/licenses/LICENSE-2.0 -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -From: Alexandru Avadanii -Date: Tue, 3 Oct 2017 02:41:41 +0200 -Subject: [PATCH] Add IDF mappings to installer adapter - -Signed-off-by: Alexandru Avadanii ---- - 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 28c0b47..abded17 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') }} -- cgit 1.2.3-korg