Merge branch 'master' into lxc_devel

[nodemanager.git] / slivermanager.py

diff --git a/slivermanager.py b/slivermanager.py
index 6264571..d118fff 100644 (file)
--- a/slivermanager.py
+++ b/slivermanager.py
@@ -14,7 +14,7 @@ import time
 import logger
 import api, api_calls
 import database
-import accounts
+import account
 import controller
 import sliver_lxc
 
@@ -210,8 +210,8 @@ def start():
     #for resname, default_amount in sliver_vs.DEFAULT_ALLOCATION.iteritems():
     #    DEFAULT_ALLOCATION[resname]=default_amount
 
-    accounts.register_class(sliver_lxc.Sliver_LXC)
-    accounts.register_class(controller.Controller)
+    account.register_class(sliver_vs.Sliver_VS)
+    account.register_class(controller.Controller)
     database.start()
     api_calls.deliver_ticket = deliver_ticket
     api.start()