X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sliver_vs.py;h=2f835436d50c35075cab76e6256154e8a40370b7;hb=3a5dbc7ac1a3ef5ed2301a256e2098908522d447;hp=f1c381efd90855be7aebc2bf54f83d8e69d80700;hpb=673e1ce1fc12e96341f12d9cd45efd280569c38d;p=nodemanager.git diff --git a/sliver_vs.py b/sliver_vs.py index f1c381e..2f83543 100644 --- a/sliver_vs.py +++ b/sliver_vs.py @@ -80,7 +80,7 @@ class Sliver_VS(accounts.Account, vserver.VServer): # so we could take planetflow as the pldistro part here as_is=None # defaults - default=file("/etc/planetlab/defaultvref").read() + default=file("/etc/planetlab/defaultvref").read().strip() (pldistro,fcdistro,arch) = default.split("-") # from the slice attribute: cut dashes and try to figure the meaning slice_wishes = vref.split("-") @@ -101,12 +101,12 @@ class Sliver_VS(accounts.Account, vserver.VServer): refname="-".join( (pldistro,fcdistro,arch) ) # check the templates exists -- there's probably a better way.. if not os.path.isdir ("/vservers/.vref/%s"%refname): - log.verbose("%s (%s) : vref %s not found, using default %s"%( + logger.verbose("%s (%s) : vref %s not found, using default %s"%( name,vref,refname,default)) refname=default except IOError: # have not found defaultvref - logger.verbose("%s (%s): using fallback vrefname 'default'"%(name,vref)) + logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref)) # for legacy nodes refname="default" except: