X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slivermanager.py;h=624853e72bc8ad59ce4e9123f38c8f2d2b184717;hb=e57432c1dfdfeaa52cc32799e2abbc34b7704ce9;hp=287ee07601cbcc2413aacaa3af60eeb9ebe5d5c7;hpb=723c15893937e6350c620f63073a691e5a447a6a;p=nodemanager.git diff --git a/slivermanager.py b/slivermanager.py index 287ee07..624853e 100644 --- a/slivermanager.py +++ b/slivermanager.py @@ -23,11 +23,15 @@ try: sliver_class_to_register = sliver_lxc.Sliver_LXC sliver_password_shell = sliver_lxc.Sliver_LXC.SHELL except: - import sliver_vs - implementation='vs' - sliver_default_type='sliver.VServer' - sliver_class_to_register = sliver_vs.Sliver_VS - sliver_password_shell = sliver_vs.Sliver_VS.SHELL + try: + import sliver_vs + implementation='vs' + sliver_default_type='sliver.VServer' + sliver_class_to_register = sliver_vs.Sliver_VS + sliver_password_shell = sliver_vs.Sliver_VS.SHELL + except: + logger.log("Could not import either sliver_lxc or sliver_vs - bailing out") + exit(1) # just being safe try : from plnode.bwlimit import bwmin, bwmax