diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-05 12:44:50 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-12-06 07:28:48 +0000 |
| commit | e2433b3d8908086cf3ba6ae04ee9d06bf7306bef (patch) | |
| tree | eb20af11cac321561b365afaef2f0987d4a13544 | |
| parent | 24ebffe4d0920d7c3c14d29dbe15f69cfdf732c1 (diff) | |
Clean up noifupdown support patch
The patch has been merged to upstream linux formula.
Change-Id: I09f96be920c5c3ecd09fd2ab132e25519902239b
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
(cherry picked from commit a6bc08b2be51b069b629d357a44cfa5979f09c2a)
| -rw-r--r-- | mcp/patches/0007-linux.network.interface-noifupdown-support.patch | 33 | ||||
| -rw-r--r-- | mcp/patches/patches.list | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/mcp/patches/0007-linux.network.interface-noifupdown-support.patch b/mcp/patches/0007-linux.network.interface-noifupdown-support.patch deleted file mode 100644 index 5539602f5..000000000 --- a/mcp/patches/0007-linux.network.interface-noifupdown-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -: 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, 5 Aug 2017 02:03:01 +0200 -Subject: [PATCH] linux.network.interface: noifupdown support - -According to [1], salt states/network supports "noifupdown" as a -parameter for each interface. -Adjust salt formula part for `linux.network.interface`, by extending -the "interface_params" in <linux/map.jinja> accordingly. - -Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com> -Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com> ---- - -diff --git a/linux/map.jinja b/linux/map.jinja ---- a/linux/map.jinja -+++ b/linux/map.jinja -@@ -92,6 +92,7 @@ - 'hashing-algorithm', - 'hardware-dma-ring-rx', - 'hwaddr', -+ 'noifupdown', - ] %} - - {% set network = salt['grains.filter_by']({ diff --git a/mcp/patches/patches.list b/mcp/patches/patches.list index d0bb7c431..fcbd3ae88 100644 --- a/mcp/patches/patches.list +++ b/mcp/patches/patches.list @@ -11,7 +11,6 @@ /usr/share/salt-formulas/env: 0004-maas-region-use-authorized_keys-1st-entry.patch /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-linux.network.interface-noifupdown-support.patch /usr/share/salt-formulas/env: 0008-Handle-file_recv-option.patch /usr/share/salt-formulas/env: 0009-seedng-module-Sync-salt-version.patch /usr/share/salt-formulas/env: 0010-maas-region-allow-timeout-override.patch |