Backporting latest changes for 2.6.27 to the 4.3 version of NM

[nodemanager.git] / sliver_vs.py

diff --git a/sliver_vs.py b/sliver_vs.py
index 579e2ab..0b1defe 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -94,7 +94,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             (pldistro,fcdistro,arch) = default.split("-")
 
             known_archs = [ 'i386', 'x86_64' ]
-            known_fcdistros = [ 'f8', 'f9', 'centos5' ]
+            known_fcdistros = [ 'centos5', 'f8', 'f9', 'f10', 'f11', 'f12' ]
             # from the slice attribute: cut dashes and try to figure the meaning
             slice_wishes = vref.split("-")
             for wish in slice_wishes:
@@ -266,8 +266,10 @@ class Sliver_VS(accounts.Account, vserver.VServer):
             self.set_ipaddresses_config(self.rspec['ip_addresses'])
 
             if self.is_running():
-                logger.log("%s: Setting name to %s" % (self.name, self.slice_id),2)
-                self.setname(self.slice_id)
+                logger.log("sliver_vs: %s: Setting name to %s" % (self.name, self.slice_id)) 
+                #self.setname(self.slice_id) 
+                logger.log("sliver_vs: %s: Storing slice id of %s for PlanetFlow" % (self.name, self.slice_id))
+                file('/etc/vservers/%s/slice_id' % self.name, 'w').write("%d"%self.slice_id)
 
             if self.enabled == False:
                 self.enabled = True