diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-06-05 16:54:02 +0400 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-06-05 13:01:09 +0000 |
| commit | 825e28054569d2df9b6ba0e9293cf0337ee11225 (patch) | |
| tree | ff6178ec417d716dd024147df7b758bbba73e63a /mcp | |
| parent | 05ee61db7286648062a4acec3c665192504c8464 (diff) | |
Clean out merged upstream patch
Change-Id: I0c8f87bad0fbe55684bd43547674ed91a31f39f8
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit 5ab2540591ad029b5b6cf23eab88959fbd14712b)
Diffstat (limited to 'mcp')
| -rw-r--r-- | mcp/patches/0004-network.dpdk-Move-ifcfg-br-prv-to-interfaces.u.patch | 41 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
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 |