pour initscript in the mix for lxc slivers

[nodemanager.git] / slivermanager.py

diff --git a/slivermanager.py b/slivermanager.py
index d118fff..4caa1ad 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -68,7 +68,8 @@ def adjustReservedSlivers (data):
     if 'reservation_policy' not in data: return
     policy=data['reservation_policy'] 
     if policy not in ['lease_or_idle', 'lease_or_shared']:
-        logger.log ("unexpected reservation_policy %(policy)s"%locals())
+        if policy is not None:
+            logger.log ("unexpected reservation_policy %(policy)s"%locals())
         return
 
     logger.log("slivermanager.adjustReservedSlivers")
@@ -210,7 +211,7 @@ def start():
     #for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
     #    DEFAULT_ALLOCATION[resname]=default_amount
 
-    account.register_class(sliver_vs.Sliver_VS)
+    account.register_class(sliver_lxc.Sliver_LXC)
     account.register_class(controller.Controller)
     database.start()
     api_calls.deliver_ticket = deliver_ticket