Commit fce33e4b authored by DELABROYE Dimitri's avatar DELABROYE Dimitri
Browse files

[generators/wiki] complementary commit to PR #78

parent 8de2ba5a
...@@ -71,7 +71,8 @@ class G5KHardwareGenerator < WikiGenerator ...@@ -71,7 +71,8 @@ class G5KHardwareGenerator < WikiGenerator
interfaces = node_hash['network_adapters'].select{ |k, v| interfaces = node_hash['network_adapters'].select{ |k, v|
v['enabled'] and v['enabled'] and
(v['mounted'] or v['mountable']) 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| }.map{ |k, v|
[ [
{ {
...@@ -91,7 +92,8 @@ class G5KHardwareGenerator < WikiGenerator ...@@ -91,7 +92,8 @@ class G5KHardwareGenerator < WikiGenerator
interfaces = node_hash['network_adapters'].select{ |k, v| interfaces = node_hash['network_adapters'].select{ |k, v|
v['enabled'] and v['enabled'] and
(v['mounted'] or v['mountable']) 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| }.map{ |k, v|
t = (v['vendor'] || 'N/A') + ' ' + (v['model'] || 'N/A'); t = (v['vendor'] || 'N/A') + ' ' + (v['model'] || 'N/A');
[ [
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment