From 6bb8e79e49878ba3c9582b004782e6af216fedcf Mon Sep 17 00:00:00 2001
From: Cyril Rohr <cyril.rohr@irisa.fr>
Date: Mon, 15 Nov 2010 11:25:45 +0100
Subject: [PATCH] [admin] rake oar:generate : correctly selects main network
adapter based on new rules.
---
generators/lib/grid5000/node.rb | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/generators/lib/grid5000/node.rb b/generators/lib/grid5000/node.rb
index d6e6f4bb56f..6f16516d918 100644
--- a/generators/lib/grid5000/node.rb
+++ b/generators/lib/grid5000/node.rb
@@ -8,7 +8,12 @@ module Grid5000
"oar-2.4" => Proc.new{ |cluster, properties|
# see https://www.grid5000.fr/mediawiki/index.php/OAR2_properties for list of properties
h = {}
- main_network_adapter = properties["network_adapters"].find{|na| na['enabled'] == true}
+ main_network_adapter = properties["network_adapters"].find{|na|
+ na['enabled'] &&
+ na['mounted'] &&
+ na['interface'] =~ /ethernet/i &&
+ !na['management']
+ }
h['host'] = main_network_adapter['network_address']
raise MissingProperty, "Node has no network_address" unless h['host']
h['ip'] = main_network_adapter['ip']
--
GitLab