From: Nicolas Turro <Nicolas.Turro@inria.fr>
Date: Wed, 28 Mar 2012 14:43:36 +0000 (+0200)
Subject: Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
X-Git-Tag: sfa-2.1-24~3^2~189
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=79a37c7df42d5029ffe1a829d052391f618981f1

Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2

Conflicts:
	sfa/senslab/slabaggregate.py
---

79a37c7df42d5029ffe1a829d052391f618981f1
diff --cc sfa/senslab/slabaggregate.py
index 7737aabc,ca9c4960..f8ce7a33
--- a/sfa/senslab/slabaggregate.py
+++ b/sfa/senslab/slabaggregate.py
@@@ -209,13 -209,11 +209,14 @@@ class SlabAggregate
              # do not include boot state (<available> element) in the manifest rspec
              if not slice:     
                  rspec_node['boot_state'] = node['boot_state']
 +                if node['hostname'] in reserved_nodes:
 +                    rspec_node['boot_state'] = "Reserved"
-             rspec_node['exclusive'] = 'true'
-             rspec_node['hardware_types'] = [HardwareType({'name': 'slab-sensor'})]
+             rspec_node['exclusive'] = 'True'
+             rspec_node['hardware_types'] = [HardwareType({'name': 'slab-node'})]
++
              # only doing this because protogeni rspec needs
              # to advertise available initscripts 
-             rspec_node['pl_initscripts'] = None
+             #rspec_node['pl_initscripts'] = None
              # add site/interface info to nodes.
              # assumes that sites, interfaces and tags have already been prepared.
              #site = sites_dict[node['site_id']]