Setting tag nodemanager-2.0-22

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 554a1b3..ed81f94 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -80,7 +80,10 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         logger.verbose('sliver_vs: %s: create'%name)
         if vref is None:
             logger.log("sliver_vs: %s: ERROR - no vref attached, this is unexpected"%(name))
-            return
+            # band-aid for short period as old API doesn't have GetSliceFamily function
+            vref = "planetlab-f8-i386"
+            #return
+
         # used to look in /etc/planetlab/family,
         # now relies on the 'GetSliceFamily' extra attribute in GetSlivers()
         # which for legacy is still exposed here as the 'vref' key
@@ -159,7 +162,11 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     def refresh_slice_vinit(self):
         body=self.initscript
         sliver_initscript="/vservers/%s/etc/rc.d/init.d/vinit.slice"%self.name
-        tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755)
+        if tools.replace_file_with_string(sliver_initscript,body,remove_if_empty=True,chmod=0755):
+            if body:
+                logger.log("vsliver_vs: %s: Installed new initscript in %s"%(self.name,sliver_initscript))
+            else:
+                logger.log("vsliver_vs: %s: Removed obsolete initscript %s"%(self.name,sliver_initscript))
 
     def start(self, delay=0):
         if self.rspec['enabled'] <= 0: