X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=d118fff49bda1181d8c771750c7b6f2202e0de8d;hb=55afbcaa2f8e9646bec3962e406f150f5d31b47b;hp=739b5c01dbc7401b69c001db89ada4b41192d789;hpb=ea84ea95d9d3ed8de232e41adf97073905255ee0;p=nodemanager.git diff --git a/slivermanager.py b/slivermanager.py index 739b5c0..d118fff 100644 --- 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 @@ -92,7 +92,7 @@ def adjustReservedSlivers (data): if is_system_sliver(sliver): sliver['reservation_alive']=True continue - + # regular slivers if not active_lease: # with 'idle_or_shared', just let the field out, behave like a shared node @@ -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()