From 1ad0f069cddcaf2a63f78c4793bfc4cb1e813a9a Mon Sep 17 00:00:00 2001
From: Pascal Morillon <pascal.morillon@irisa.fr>
Date: Fri, 25 Mar 2011 08:52:15 +0100
Subject: [PATCH] [admin][rennes] Remove dns_lookup and add switch port
 informations for the cluster parapide

---
 generators/input/rennes-parapide.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/generators/input/rennes-parapide.rb b/generators/input/rennes-parapide.rb
index 79969a8f7f8..0c1f55a3d8b 100644
--- a/generators/input/rennes-parapide.rb
+++ b/generators/input/rennes-parapide.rb
@@ -48,8 +48,9 @@ site :rennes do |site_uid|
           :device => "eth0",
           :driver => "igb",
           :network_address => "#{node_uid}.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}.#{site_uid}.grid5000.fr"),
-          :switch => "c6509-grid"
+          :ip => lookup('rennes-parapide', node_uid, 'network_interfaces', 'eth0', 'ip'),
+          :switch => "c6509-grid",
+          :switch_port => lookup('rennes-parapide', node_uid, 'network_interfaces', 'eth0', 'switch_port')
         },
         {
           :interface => 'Ethernet',
@@ -71,7 +72,7 @@ site :rennes do |site_uid|
           :vendor => "Mellanox",
           :version => "MT25418",
           :network_address => "#{node_uid}-ib0.#{site_uid}.grid5000.fr",
-          :ip => dns_lookup("#{node_uid}-ib0.#{site_uid}.grid5000.fr")
+          :ip => lookup('rennes-parapide', node_uid, 'network_interfaces', 'ib0', 'ip')
         }]
       end
     end
-- 
GitLab