summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-05 16:54:02 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-06-05 16:54:02 +0400
commit5ab2540591ad029b5b6cf23eab88959fbd14712b (patch)
treeca3a70d4ef8d8724090b876c3841b9dbb5faada9
parent4ee7da0aa1128569bc97e5a28ce10a3ce1aac142 (diff)
Clean out merged upstream patch
Change-Id: I0c8f87bad0fbe55684bd43547674ed91a31f39f8 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rw-r--r--mcp/patches/0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch41
-rw-r--r--mcp/patches/patches.list1
2 files changed, 0 insertions, 42 deletions
diff --git a/mcp/patches/0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch b/mcp/patches/0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch
deleted file mode 100644
index 180a9ddee..000000000
--- a/mcp/patches/0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch
+++ /dev/null
@@ -1,41 +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: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 25 Feb 2018 03:43:49 +0100
-Subject: [PATCH] network.dpdk: Move ifcfg-br-prv to interfaces.u
-
-Workaround for Upstream-Bug:
-https://github.com/saltstack/salt/issues/40262
-
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- linux/network/dpdk.sls | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/linux/network/dpdk.sls b/linux/network/dpdk.sls
-index 05fe05f..cc0ff9e 100644
---- a/linux/network/dpdk.sls
-+++ b/linux/network/dpdk.sls
-@@ -128,7 +128,7 @@ linux_network_dpdk_bridge_interface_{{ interface_name }}:
- After=openvswitch-switch.service
-
- {# enforce ip address and mtu for ovs dpdk br-prv #}
--/etc/network/interfaces.d/ifcfg-{{ interface_name }}:
-+/etc/network/interfaces.u/ifcfg-{{ interface_name }}:
- file.managed:
- - contents: |
- auto {{ interface_name }}
-@@ -138,6 +138,7 @@ linux_network_dpdk_bridge_interface_{{ interface_name }}:
- {%- if interface.mtu is defined %}
- mtu {{ interface.mtu }}
- {%- endif %}
-+ - makedirs: True
- - require:
- - file: /etc/systemd/system/ifup@{{ interface_name }}.service.d/override.conf
-
diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list
index b00a1d194..fbc671f31 100644
--- a/mcp/patches/patches.list
+++ b/mcp/patches/patches.list
@@ -7,7 +7,6 @@
##############################################################################
/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
/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-extra-environment-variables.patch