aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-17 18:33:56 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-02-17 18:33:56 +0100
commit398774083ee05973111226d62e9be7048c5063de (patch)
tree441ba00acc824782c558a99caf3a7752853aed9b
parent86978392a9ba7e6a12af88b94852f3815efbb66a (diff)
fuel-nailgun-agent: Fixup SR-IOV filtering patch
Our previous SR-IOV filtering adjustment in fuel-nailgun-agent broke detection for real SR-IOV capable interfaces, omitting them from the inteface list. For ThunderX systems, where interfaces are VFs, the "physfn" dir exists, but has no "physfn/net" subdir. Change-Id: Iaea937f360f81ac59212b8c380fecf72e9985844 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--patches/fuel-nailgun-agent/0002-Temporary-SR-IOV-Fix-VNICs-broken-filter.patch4
1 files changed, 2 insertions, 2 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 a3cb1ea..cbd94f2 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
@@ -8,7 +8,7 @@ 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 "sriov_totalvfs" file to determine whether current eth is
+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].
@@ -29,7 +29,7 @@ index 89ab60f..eb2bfb4 100755
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/sriov_totalvfs")
++ next if File.exists?("/sys/class/net/#{int}/device/physfn/net")
int_meta = {:name => int}
int_meta[:interface_properties] = {}
int_meta[:state] = intinfo[:state]