vserver names based on buildname, rather than the not too helpful rpm name

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 4933456..2e65dc0 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -102,9 +102,9 @@ class TestPlc:
     def name(self):
         name=self.plc_spec['name']
         if self.vserver:
-            return name+".vserver.%s"%self.vservername
+            return "%s.%s"%(name,self.vservername)
         else:
-            return name+".chroot"
+            return "%s.chroot"%name
 
     def hostname(self):
         return self.plc_spec['hostname']

diff --git a/system/config_1vservers.py b/system/config_1vservers.py
index 7e31b55..bb01ebd 100644 (file)
--- a/system/config_1vservers.py
+++ b/system/config_1vservers.py
@@ -34,10 +34,7 @@ def config (plcs,options):
             # compute a helpful vserver name - remove domain in hostname
             simplehostname=hostname.split('.')[0]
             # myplc rpm basename, without .rpm
-            vservername = os.path.basename(options.myplc_url)
-            vservername = vservername.replace(".rpm","")
-            # vservername
-            vservername = vservername.replace("myplc","vtest")
+            vservername = options.buildname
             if len(plcs) == 1 :
                 vservername = "%s-%s" % (vservername,simplehostname)
             else: