fixed a couple remaining issues, seems to work

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index ca5d144..2f83543 100644 (file)
--- 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,21 +101,22 @@ 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))
+        except IOError:
+            # have not found defaultvref
+            logger.verbose("%s (%s): legacy node - using fallback vrefname 'default'"%(name,vref))
                 # for legacy nodes
-                refname="default"
-            except:
-                import traceback
-                logger.log("%s (%s) : unexpected error follows - using 'default'"%(
-                        name,vref))
-                logger.log(traceback.format_exc())
+            refname="default"
+        except:
+            import traceback
+            logger.log("%s (%s) : unexpected error follows - using 'default'"%(
+                    name,vref))
+            logger.log(traceback.format_exc())
+            refname="default"
             
-            logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
+        logger.log_call('/usr/sbin/vuseradd', '-t', refname, name)
         open('/vservers/%s/etc/slicename' % name, 'w').write(name)
 
     @staticmethod