diff options
Diffstat (limited to 'patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch')
| -rw-r--r-- | patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch | 69 |
1 files changed, 53 insertions, 16 deletions
diff --git a/patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch b/patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch index e2ab3f61..4fa8a3be 100644 --- a/patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch +++ b/patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch @@ -7,7 +7,7 @@ : http://www.apache.org/licenses/LICENSE-2.0 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> -Date: Thu, 7 Jul 2016 13:58:34 +0200 +Date: Fri, 19 May 2017 20:36:24 +0200 Subject: [PATCH] Temporary: SR-IOV: Fix VNICs broken filter. Some blades have VNICs (VFs on a PCI device), which are not @@ -25,19 +25,56 @@ FIXME: Revert this patch once upstream closes bug [1]. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - agent | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + ...-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch | 35 ++++++++++++++++++++++ + debian/patches/series | 1 + + 2 files changed, 36 insertions(+) + create mode 100644 debian/patches/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch -diff --git a/agent b/agent -index 89ab60f..eb2bfb4 100755 ---- a/agent -+++ b/agent -@@ -406,7 +406,7 @@ class NodeAgent - next if File.exist?("/sys/class/net/#{int}/phy80211") || - File.exist?("/sys/class/net/#{int}/wireless") - # Skip virtual functions -- next if File.exists?("/sys/class/net/#{int}/device/physfn") -+ next if File.exists?("/sys/class/net/#{int}/device/physfn/net") - int_meta = {:name => int} - int_meta[:interface_properties] = {} - int_meta[:state] = intinfo[:state] +diff --git a/debian/patches/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch b/debian/patches/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch +new file mode 100644 +index 0000000..87cdffc +--- /dev/null ++++ b/debian/patches/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch +@@ -0,0 +1,35 @@ ++From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++Date: Thu, 7 Jul 2016 13:58:34 +0200 ++Subject: [PATCH 1/4] Temporary: SR-IOV: Fix VNICs broken filter. ++ ++Some blades have VNICs (VFs on a PCI device), which are not ++SR-IOV VFs. ++ ++Bug report: "VNICs ignored due to SR-IOV filtering" [1] ++ ++HACK: Instead of checking for "physfn", we now rely on testing ++for "physfn/net" subdir to determine whether current eth is ++a SR-IOV VF or something else (thus keeping VNICs). ++ ++FIXME: Revert this patch once upstream closes bug [1]. ++ ++[1] https://bugs.launchpad.net/fuel/+bug/1597775 ++ ++Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> ++--- ++ agent | 2 +- ++ 1 file changed, 1 insertion(+), 1 deletion(-) ++ ++diff --git a/agent b/agent ++index e0251be..2c041ec 100755 ++--- a/agent +++++ b/agent ++@@ -581,7 +581,7 @@ class NodeAgent ++ next if File.exist?("/sys/class/net/#{int}/phy80211") || ++ File.exist?("/sys/class/net/#{int}/wireless") ++ # Skip virtual functions ++- next if File.exists?("/sys/class/net/#{int}/device/physfn") +++ next if File.exists?("/sys/class/net/#{int}/device/physfn/net") ++ int_meta = {:name => int} ++ int_meta[:interface_properties] = {} ++ int_meta[:state] = intinfo[:state] +diff --git a/debian/patches/series b/debian/patches/series +index b221a98..3980c60 100644 +--- a/debian/patches/series ++++ b/debian/patches/series +@@ -1 +1,2 @@ + 0001-ohai-Support-reading-L1-info-from-ethtool.patch ++0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch |