From b6fc178fc54f99cd1ca539ef72e92a64dd8a5b21 Mon Sep 17 00:00:00 2001
From: Simon Delamare <simon.delamare@ens-lyon.fr>
Date: Tue, 11 Dec 2012 18:36:59 +0100
Subject: [PATCH] [admin] Only generate OAR comment property on node creation
---
Rakefile | 2 ++
generators/lib/grid5000/node.rb | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/Rakefile b/Rakefile
index 3fbfd3be10a..c2e90ad67e1 100644
--- a/Rakefile
+++ b/Rakefile
@@ -189,6 +189,8 @@ namespace :oar do
# by default, maintenance is YES when creating new resources
command.concat(' -p maintenance="YES"')
end
+ # by default, an Alive node has comment "OK"
+ command.concat(' -p comment="OK"')
end
command.concat(" -p ").concat( export.to_a.map{|(k,v)|
if v.nil?
diff --git a/generators/lib/grid5000/node.rb b/generators/lib/grid5000/node.rb
index 1ee5c43a199..bdc94aaf510 100644
--- a/generators/lib/grid5000/node.rb
+++ b/generators/lib/grid5000/node.rb
@@ -43,7 +43,6 @@ module Grid5000
h['memcore'] = properties['main_memory']['ram_size']/properties['architecture']['smt_size']/MiB
h['memcpu'] = properties['main_memory']['ram_size']/properties['architecture']['smp_size']/MiB
h['memnode'] = properties['main_memory']['ram_size']/MiB
- h['comment'] = properties['comment'] || "OK"
properties["gpu"] ||= {}
h['gpu'] = properties['gpu']['gpu'] ? "YES" : "NO"
properties["monitoring"] ||= {}
--
GitLab