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/config/labs/local/idf-virtual1.yaml | 2 ++ .../0001-Disable-root_helper_daemon-option.patch | 40 ---------------------- ...tron.server.conf.Debian-Fix-undefined-var.patch | 32 +++++++++++++++++ mcp/patches/patches.list | 2 +- .../mcp-pike-common-ha/openstack_control.yml.j2 | 1 + .../mcp-pike-common-noha/openstack_control.yml | 1 + mcp/scripts/pharos | 2 +- 7 files changed, 38 insertions(+), 42 deletions(-) delete mode 100644 mcp/patches/0001-Disable-root_helper_daemon-option.patch create mode 100644 mcp/patches/0001-pike-neutron.server.conf.Debian-Fix-undefined-var.patch diff --git a/mcp/config/labs/local/idf-virtual1.yaml b/mcp/config/labs/local/idf-virtual1.yaml index 7d45dd24f..f73024948 100644 --- a/mcp/config/labs/local/idf-virtual1.yaml +++ b/mcp/config/labs/local/idf-virtual1.yaml @@ -27,6 +27,7 @@ idf: interface: 1 # when used, will be second vnet interface, untagged vlan: native network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra mask: 24 storage: interface: 4 # when used, will be fifth vnet interface, untagged @@ -42,6 +43,7 @@ idf: interface: 3 # when used, will be fourth vnet interface, untagged vlan: native network: 10.16.0.0 + ip-range: 10.16.0.10-10.16.0.254 # Some IPs are in use by lab infra mask: 24 gateway: 10.16.0.1 dns: diff --git a/mcp/patches/0001-Disable-root_helper_daemon-option.patch b/mcp/patches/0001-Disable-root_helper_daemon-option.patch deleted file mode 100644 index 389393975..000000000 --- a/mcp/patches/0001-Disable-root_helper_daemon-option.patch +++ /dev/null @@ -1,40 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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: Michael Polenchuk -Date: Tue, 6 Mar 2018 16:15:57 +0400 -Subject: [PATCH] Disable root_helper_daemon option - -Change-Id: I4cc6cce4868ea95e806ce4b41069805fb995dcdb - -diff --git a/neutron/files/pike/neutron-generic.conf.Debian b/neutron/files/pike/neutron-generic.conf.Debian -index a94a24b..bec041f 100644 ---- a/neutron/files/pike/neutron-generic.conf.Debian -+++ b/neutron/files/pike/neutron-generic.conf.Debian -@@ -668,7 +668,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) --root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf -+#root_helper_daemon = - - # Seconds between nodes reporting state to server; should be less than - # agent_down_time, best if it is half or less than agent_down_time. (floating -diff --git a/neutron/files/pike/neutron-server.conf.Debian b/neutron/files/pike/neutron-server.conf.Debian -index 2daaebf..c9554c8 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) --root_helper_daemon = sudo neutron-rootwrap-daemon /etc/neutron/rootwrap.conf -+#root_helper_daemon = - - # Seconds between nodes reporting state to server; should be less than - # agent_down_time, best if it is half or less than agent_down_time. (floating 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 = 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 diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 index 1436828a5..c487e3424 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_control.yml.j2 @@ -134,6 +134,7 @@ parameters: neutron: server: vlan_aware_vms: true + root_helper_daemon: false keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml index 22d136acc..5c0cbe07f 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml +++ b/mcp/reclass/classes/cluster/mcp-pike-common-noha/openstack_control.yml @@ -125,3 +125,4 @@ parameters: neutron: server: vlan_aware_vms: true + root_helper_daemon: false diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos index 6320cb4da..46dd0bda1 160000 --- a/mcp/scripts/pharos +++ b/mcp/scripts/pharos @@ -1 +1 @@ -Subproject commit 6320cb4dace4da1ad24d0e09a786ef65c18ea0ca +Subproject commit 46dd0bda1606b851ec7e7e82c1823fb9ae99490f -- cgit 1.2.3-korg