From fce33e4ba2eacc38d367a00f37b816cf1b2bcf8b Mon Sep 17 00:00:00 2001
From: Dimitri DELABROYE <dimitri.delabroye@inria.fr>
Date: Mon, 25 Jun 2018 11:28:34 +0200
Subject: [PATCH] [generators/wiki] complementary commit to PR #78
---
generators/wiki/lib/generators/hardware.rb | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/generators/wiki/lib/generators/hardware.rb b/generators/wiki/lib/generators/hardware.rb
index 17aa7f872f8..40abd43ef9e 100644
--- a/generators/wiki/lib/generators/hardware.rb
+++ b/generators/wiki/lib/generators/hardware.rb
@@ -71,7 +71,8 @@ class G5KHardwareGenerator < WikiGenerator
interfaces = node_hash['network_adapters'].select{ |k, v|
v['enabled'] and
(v['mounted'] or v['mountable']) and
- not v['management']
+ not v['management'] and
+ (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417
}.map{ |k, v|
[
{
@@ -91,7 +92,8 @@ class G5KHardwareGenerator < WikiGenerator
interfaces = node_hash['network_adapters'].select{ |k, v|
v['enabled'] and
(v['mounted'] or v['mountable']) and
- not v['management']
+ not v['management'] and
+ (k =~ /\./).nil? # exclude PKEY / VLAN interfaces see #9417
}.map{ |k, v|
t = (v['vendor'] || 'N/A') + ' ' + (v['model'] || 'N/A');
[
--
GitLab