From cf6cd9cd0e00ab1c1165f826a261476b3155268d Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 7 Mar 2018 22:00:29 +0100 Subject: [IDF] net_config: Add support for custom ip-range - submodule: bump Pharos to pick up installer adapter support, as well as IDF updates for Ericsson baremetal pod1; - labs/local/virtual: Bump mgmt, public networks start addresses from .1 to .10, similar to ericsson-pod1; While at it, drop patch now upstream and instead adopt the new param 'neutron:server:root_helper_daemon'. JIRA: FUEL-351 Change-Id: I9bc244a7fd8698861a390ed2b6a27804be46c285 Signed-off-by: Alexandru Avadanii --- mcp/patches/patches.list | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/patches/patches.list') diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index d1cd1b5b9..efe38218e 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -5,7 +5,7 @@ # which accompanies this distribution, and is available at # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -/usr/share/salt-formulas/env: 0001-Disable-root_helper_daemon-option.patch +/usr/share/salt-formulas/env: 0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch /usr/share/salt-formulas/env: 0002-maas-region-skip-credentials-update.patch /usr/share/salt-formulas/env: 0003-maas-region-force-artifact-download.patch /usr/share/salt-formulas/env: 0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch -- cgit 1.2.3-korg