[Erp5-report] r35024 rafael - /erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/

[nobody at svn.erp5.org]

Author: rafael
Date: Wed May  5 20:04:01 2010
New Revision: 35024

URL: http://svn.erp5.org?rev=35024&view=rev
Log:
Create pid file into appropriate place and add snapshot definition.

Modified:
    erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py

Modified: erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py?rev=35024&r1=35023&r2=35024&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py [utf8] (original)
+++ erp5/trunk/utils/erp5.recipe.kvm/src/erp5/recipe/kvm/__init__.py [utf8] Wed May  5 20:04:01 2010
@@ -36,6 +36,9 @@
 
     options.setdefault('kvm_bin_directory',
                        buildout['buildout']['bin-directory'])
+
+    options.setdefault('kvm_run_directory',
+                       buildout['buildout']['var-directory'])
 
     options.setdefault("url", '')
     options.setdefault("md5sum", '')
@@ -91,15 +94,20 @@
                      "\n        '%s', '%s', "
                      "\n        sys.argv[1]" % (ssh_user, ssh_hostname,
                                                 ssh_port, ssh_key_path)))
-
     script_name = "%s-ctl" % self.name
+    snapshot = "False"
+    kvm_snapshot = options.get("kvm_snapshot", "true").lower()
+    if kvm_snapshot == 'true': 
+      snapshot = "True"
+    kvm_pid_file = "%s/%s.pid" % (options.get('kvm_run_directory'), self.name)
     scripts = zc.buildout.easy_install.scripts(
         [(script_name,'erp5.recipe.kvm.kvm', 'ctl')],
         ws, options['executable'], options.get("kvm_bin_directory"),
-        arguments = ("\n        '%s', '%s',  "
-                     "\n        '%s.pid' , '%s', "
-                     "\n        sys.argv[1:]" % (image, ssh_port, 
-                                                 self.name, self.name)))
+        arguments = ("\n        '%s', '%s',      "
+                     "\n        '%s' , '%s', %s, "
+                     "\n        sys.argv[1]" % (image, ssh_port,
+                                                kvm_pid_file, self.name,
+                                                snapshot)))
     return location
 
   def download(self):