Clean up upstreamed patches

Change-Id: Icee56da3720f0926e42390965581639f6a344b77
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/mcp/patches/0008-Handle-kernel-boot-options.patch b/mcp/patches/0008-Handle-kernel-boot-options.patch
deleted file mode 100644 (file)
index f5198a2..0000000
--- a/mcp/patches/0008-Handle-kernel-boot-options.patch
+++ /dev/null
@@ -1,69 +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 <mpolenchuk@mirantis.com>
-Date: Thu, 25 Jan 2018 13:22:39 +0400
-Subject: [PATCH] Handle kernel boot options
-
-The 'system.kernel.elevator' and 'system.kernel.isolcpu' options
-have been kept for backward compatibility and should be used in new
-fashion way with system.kernel.boot_options parameter.
-
-Change-Id: I51f7167b8b8946500df2065ee6b02bcf21809bc9
-
-diff --git a/linux/system/kernel.sls b/linux/system/kernel.sls
-index 59b7177..b1c3f3b 100644
---- a/linux/system/kernel.sls
-+++ b/linux/system/kernel.sls
-@@ -3,39 +3,24 @@
-
- {%- if system.kernel is defined %}
-
--{%- if system.kernel.isolcpu is defined or system.kernel.elevator is defined %}
-+{%- set kernel_boot_opts = [] %}
-+{%- do kernel_boot_opts.append('isolcpus=' ~ system.kernel.isolcpu) if system.kernel.isolcpu is defined %}
-+{%- do kernel_boot_opts.append('elevator=' ~ system.kernel.elevator) if system.kernel.elevator is defined %}
-+{%- do kernel_boot_opts.extend(system.kernel.boot_options) if system.kernel.boot_options is defined %}
-
-+{%- if kernel_boot_opts %}
- include:
-   - linux.system.grub
-
--{%- if system.kernel.isolcpu is defined %}
--
--/etc/default/grub.d/90-isolcpu.cfg:
--  file.managed:
--    - contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT isolcpus={{ system.kernel.isolcpu }}"'
--    - require:
--      - file: grub_d_directory
--{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %} 
--    - watch_in:
--      - cmd: grub_update
--
--{%- endif %}
--{%- endif %}
--
--{%- if system.kernel.elevator is defined %}
--
--/etc/default/grub.d/91-elevator.cfg:
-+/etc/default/grub.d/99-custom-settings.cfg:
-   file.managed:
--    - contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT elevator={{ system.kernel.elevator }}"'
-+    - contents: 'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT {{ kernel_boot_opts|join(' ') }}"'
-     - require:
-       - file: grub_d_directory
- {%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
-     - watch_in:
-       - cmd: grub_update
--
--{%- endif %}
- {%- endif %}
--
- {%- endif %}
-
- {%- if system.kernel.version is defined %}

diff --git a/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch b/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch
deleted file mode 100644 (file)
index f73931e..0000000
--- a/mcp/patches/0013-dpdk-Support-ovs-bridge-tagging.patch
+++ /dev/null
@@ -1,30 +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 <mpolenchuk@mirantis.com>
-Date: Mon, 22 Jan 2018 15:22:47 +0400
-Subject: [PATCH] [dpdk] Support ovs bridge tagging
-
-Bring in "tag" option for dpdk/ovs bridges
-to support vlan-tagged vxlan mode.
-
-Change-Id: I7f1f88233694f2c8b968a6cf55584f32879ec042
-
-diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls
-index 1ac9e25..05fe05f 100644
---- a/linux/network/dpdk.sls
-+++ b/linux/network/dpdk.sls
-@@ -110,7 +110,7 @@ linux_network_dpdk_bond_mode_{{ interface_name }}:
-
- linux_network_dpdk_bridge_interface_{{ interface_name }}:
-   cmd.run:
--    - name: "ovs-vsctl add-br {{ interface_name }} -- set bridge {{ interface_name }} datapath_type=netdev"
-+    - name: "ovs-vsctl add-br {{ interface_name }} -- set bridge {{ interface_name }} datapath_type=netdev{% if interface.tag is defined %} -- set port {{ interface_name }} tag={{ interface.tag }}{% endif %}"
-     - unless: "ovs-vsctl show | grep {{ interface_name }}"
-
-     {# OVS dpdk needs ip address for vxlan termination on bridge br-prv #}

diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index 22d5a7a..eb17cec 100644 (file)
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+# 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
@@ -12,9 +12,7 @@
 /usr/share/salt-formulas/env: 0005-maas-module-Obtain-fabric-ID-from-CIDR.patch
 /usr/share/salt-formulas/env: 0006-maas-module-Add-VLAN-DHCP-enable-support.patch
 /usr/share/salt-formulas/env: 0007-network.interface-Fix-ifup-OVS-port-with-route.patch
-/usr/share/salt-formulas/env: 0008-Handle-kernel-boot-options.patch
 /usr/share/salt-formulas/env: 0009-controller-Use-keystoneclient-to-check-project-ID.patch
 /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch
 /usr/share/salt-formulas/env: 0011-system.repo-Debian-Add-keyserver-proxy-support.patch
 /usr/share/salt-formulas/env: 0012-routes-Skip-network-restart-on-noifupdown.patch
-/usr/share/salt-formulas/env: 0013-dpdk-Support-ovs-bridge-tagging.patch