git://git.onelab.eu
/
nodemanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor of code to allow several virt techs. Minor bugs. Closes #8.
[nodemanager.git]
/
slivermanager.py
diff --git
a/slivermanager.py
b/slivermanager.py
index
d89bb22
..
3e4fb1f
100644
(file)
--- a/
slivermanager.py
+++ b/
slivermanager.py
@@
-17,7
+17,7
@@
import database
import accounts
import controller
import sliver_vs
import accounts
import controller
import sliver_vs
-import sliver_l
ibvirt
+import sliver_l
xc
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
try: from bwlimit import bwmin, bwmax
except ImportError: bwmin, bwmax = 8, 1000*1000*1000
@@
-210,7
+210,8
@@
def start():
DEFAULT_ALLOCATION[resname]=default_amount
#accounts.register_class(sliver_vs.Sliver_VS)
DEFAULT_ALLOCATION[resname]=default_amount
#accounts.register_class(sliver_vs.Sliver_VS)
- accounts.register_class(sliver_libvirt.Sliver_LV)
+ #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
accounts.register_class(controller.Controller)
database.start()
api_calls.deliver_ticket = deliver_ticket