fixed and moved the server-side yum scripts, from nodeconfig/yum to BootstrapFS/nodec...

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index b8b5ced..8723e8c 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -80,19 +80,14 @@ class Sliver_VS(accounts.Account, vserver.VServer):
         if vref is None:
             logger.log("creating %s : no vref attached, this is unexpected"%name)
             vref='default'
-        # used to look in /etc/planetlab/family, now relies on the 'family' extra attribute in GetSlivers()
+        # 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
         
         # check the template exists -- there's probably a better way..
         if not os.path.isdir ("/vservers/.vref/%s"%vref):
-            # find a resonable default
-            if os.path.isfile ("/etc/planetlab/slicefamily"):
-                default=file("/etc/planetlab/slicefamily").read().strip()
-            else:
-                default='default'
-                logger.log("creating %s : /etc/planetlab/slicefamily not found, this is unexpected"%name)
-            logger.log("creating %s - vref %s not found, using default %s"%(name,vref,default))
-            vref=default
+            logger.log ("%s: ERROR Could not create sliver - vreference image %s not found"%(name,vref))
+            return
 
         # guess arch
         try:
@@ -237,9 +232,13 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             self.set_ipaddresses_config(self.rspec['ip_addresses'])
 
             if self.is_running():
-                logger.log("%s: Storing slice id for PlanetFlow" % (self.name, self.slice_id),2)
-                #self.setname(self.slice_id)
-                file('/etc/vservers/%s/slice_id' % name, 'w').write(self.slice_id)
+                logger.log("%s: Setting name to %s" % (self.name, self.slice_id)) 
+                self.setname(self.slice_id) 
+                ### Sapan's change needs more work 
+                # raise IOException, file does not get created
+                # might be that /etc/vservers is not available here, are we in the chroot ?
+                #logger.log("%s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
+                #file('/etc/vservers/%s/slice_id' % self.name, 'w').write(self.slice_id)
 
             if self.enabled == False:
                 self.enabled = True