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 --- ...tron.server.conf.Debian-Fix-undefined-var.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch (limited to 'mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch') diff --git a/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch b/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch new file mode 100644 index 000000000..d1f7b40ff --- /dev/null +++ b/mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch @@ -0,0 +1,32 @@ +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +: Copyright (c) 2018 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: Wed, 7 Mar 2018 23:44:32 +0100 +Subject: [PATCH] pike/neutron.server.conf.Debian: Fix undefined var + +Fixes: 1ff8865b + +Signed-off-by: Alexandru Avadanii +--- + neutron/files/pike/neutron-server.conf.Debian | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian +index 94443cf..cc75da5 100644 +--- a/neutron/files/pike/neutron-server.conf.Debian ++++ b/neutron/files/pike/neutron-server.conf.Debian +@@ -717,7 +717,7 @@ root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf + # needs to execute commands in Dom0 in the hypervisor of XenServer, this item + # should be set to 'xenapi_root_helper', so that it will keep a XenAPI session + # to pass commands to Dom0. (string value) +-{%- if neutron.root_helper_daemon|default(True) %} ++{%- if server.root_helper_daemon|default(True) %} + root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf + {%- else %} + #root_helper_daemon = -- cgit 1.2.3-korg