summaryrefslogtreecommitdiffstats
path: root/mcp/patches
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-16 21:11:26 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-12-18 02:40:25 +0100
commit215a37d55356333f9fd0a96118c9a00d588eca62 (patch)
tree24619c2d8b61f6bd6cc79923e3dab98677991d30 /mcp/patches
parent2fc4b8890ef1ad456ac1ff421f33e005ae0484be (diff)
[baremetal] MaaS: Fix DHCP dynamic reserved range
- patch MaaS to default to `DHCP` instead of `AUTO` for physical PXE interfaces (all IPs will be handed out by MaaS DHCP *inside* the defined dynamic DHCP IP range); - reduce range to silence bogus MaaS warning about address exhaustion; - regenerate pod_config.yml.example to reflect the changes; - drop `opnfv_infra_maas_pxe_address` (duplicate of `opnfv_infra_maas_node01_deploy_address`); - add `opnfv_infra_config_pxe_address` for future usage; - while at it, fix missing patch copyright; JIRA: FUEL-316 Change-Id: I81fad333e77f7c8508cd2b2b267c7b39c130e3e1 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/patches')
-rw-r--r--mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch44
-rw-r--r--mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch8
-rw-r--r--mcp/patches/patches.list1
-rw-r--r--mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch47
4 files changed, 100 insertions, 0 deletions
diff --git a/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch b/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch
new file mode 100644
index 000000000..d161a9527
--- /dev/null
+++ b/mcp/patches/0011-maas-region-interface-default-mode-DHCP.patch
@@ -0,0 +1,44 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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 <Alexandru.Avadanii@enea.com>
+Date: Mon, 18 Dec 2017 02:03:01 +0200
+Subject: [PATCH] maas: region: interface: default mode DHCP
+
+Switch MaaS interface mode default from AUTO to DHCP.
+This way, MaaS will not statically assign IPs *outside* the dynamic
+reserved range, but instead DHCP will assign them *inside* the range.
+
+One alternative would be to handle this via API calls, for each
+node's PXE physical interface, but that overcomplicates things.
+
+JIRA: FUEL-316
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+
+diff --git a/maas/region.sls b/maas/region.sls
+--- a/maas/region.sls
++++ b/maas/region.sls
+@@ -39,6 +39,16 @@
+ - require_in:
+ - service: maas_region_services
+
++maas_interface_default_mode_dhcp:
++ file.replace:
++ - name: "/usr/lib/python3/dist-packages/maasserver/models/node.py"
++ - pattern: '^(\s+INTERFACE_LINK_TYPE)\.AUTO'
++ - repl: \1.DHCP
++ - require:
++ - pkg: maas_region_packages
++ - require_in:
++ - service: maas_region_services
++
+ {%- if region.get('enable_iframe', False) %}
+
+ /etc/apache2/conf-enabled/maas-http.conf:
diff --git a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
index 1ac6cd157..715ddc042 100644
--- a/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
+++ b/mcp/patches/0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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 <Alexandru.Avadanii@enea.com>
Date: Sun, 20 Aug 2017 02:03:01 +0200
Subject: [PATCH] libvirt: unix_sock_group: s/libvirtd/libvirt/
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index a87a935bc..d16e3c207 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -13,5 +13,6 @@
/usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
/usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch
/usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
+/usr/share/salt-formulas/env: 0011-maas-region-interface-default-mode-DHCP.patch
/usr/share/salt-formulas/env: 0012-linux.storage.lvm-Disable-filter.patch
/usr/share/salt-formulas/env: 0013-libvirt-unix_sock_group-s-libvirtd-libvirt.patch
diff --git a/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch b/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch
new file mode 100644
index 000000000..27467dd61
--- /dev/null
+++ b/mcp/patches/pharos/0001-Update-MaaS-PXE-config.patch
@@ -0,0 +1,47 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: 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 <Alexandru.Avadanii@enea.com>
+Date: Sat, 16 Dec 2017 21:14:35 +0100
+Subject: [PATCH] Update MaaS PXE config
+
+- reduce DHCP range to silence a dummy MaaS warning about address exhaustion;
+- define PXE/admin address for Salt Master node;
+- drop obsolete opnfv_infra_maas_pxe_address;
+
+JIRA: FUEL-316
+
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ config/installers/fuel/pod_config.yml.j2 | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
+index 28c6188..f380535 100644
+--- a/config/installers/fuel/pod_config.yml.j2
++++ b/config/installers/fuel/pod_config.yml.j2
+@@ -40,6 +40,7 @@ parameters:
+ {%- endif %}
+
+ opnfv_infra_config_address: {{ net_mgmt | ipaddr_index('100') }}
++ opnfv_infra_config_pxe_address: {{ net_admin | ipaddr_index('2') }}
+ opnfv_infra_maas_node01_address: {{ net_mgmt | ipaddr_index('3') }}
+ opnfv_infra_maas_node01_deploy_address: {{ net_admin | ipaddr_index('3') }}
+ opnfv_infra_kvm_address: {{ net_mgmt | ipaddr_index('140') }}
+@@ -48,9 +49,8 @@ parameters:
+ opnfv_infra_kvm_node03_address: {{ net_mgmt | ipaddr_index('143') }}
+
+ opnfv_infra_maas_pxe_network_address: {{ net_admin }}
+- opnfv_infra_maas_pxe_address: {{ net_admin | ipaddr_index('3') }}
+- opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('5') }}
+- opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('250') }}
++ opnfv_infra_maas_pxe_start_address: {{ net_admin | ipaddr_index('4') }}
++ opnfv_infra_maas_pxe_end_address: {{ net_admin | ipaddr_index('100') }}
+
+ opnfv_openstack_gateway_node01_address: {{ net_mgmt | ipaddr_index('124') }}
+ opnfv_openstack_gateway_node02_address: {{ net_mgmt | ipaddr_index('125') }}