[generators/wiki] complementary commit to PR #78

fce33e4b · DELABROYE Dimitri · 8de2ba5a · fce33e4b
Commit fce33e4b authored Jun 25, 2018 by DELABROYE Dimitri
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

generators/wiki/lib/generators/hardware.rb generators/wiki/lib/generators/hardware.rb +4 -2

No files found.
--- 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');
            [