Merge branch 'master' into lxc_devel

[nodemanager.git] / slivermanager.py

diff --git a/slivermanager.py b/slivermanager.py
index 383379e..3e4fb1f 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -17,6 +17,7 @@ import database
 import accounts
 import controller
 import sliver_vs
+import sliver_lxc
 
 try: from bwlimit import bwmin, bwmax
 except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@ -208,7 +209,9 @@ def start():
     for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
         DEFAULT_ALLOCATION[resname]=default_amount
 
-    accounts.register_class(sliver_vs.Sliver_VS)
+    #accounts.register_class(sliver_vs.Sliver_VS)
+    #accounts.register_class(sliver_libvirt.Sliver_LV)
+    accounts.register_class(sliver_lxc.Sliver_LXC)
     accounts.register_class(controller.Controller)
     database.start()
     api_calls.deliver_ticket = deliver_ticket