File vmware-vmm-remotes.patch of Package opennebula-driver-vmware3

File vmware-vmm-remotes.patch of Package opennebula-driver-vmware3 (Revision 5)

Currently displaying revision 5, show latest

--- vmm/remotes/cancel.orig	2011-07-09 11:10:15.146440067 +0200
+++ vmm/remotes/cancel	2011-07-09 11:11:53.845168776 +0200
@@ -28,7 +28,12 @@
     exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+	VMWARERC_LOCATION="/etc/one/vmwarerc"
+else
+	VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+end
+load VMWARERC_LOCATION
 
 # Destroy the VM
 data = perform_action("virsh -c #{LIBVIRT_URI} destroy #{deploy_id}") 
--- vmm/remotes/deploy.orig	2011-07-09 11:10:21.950021277 +0200
+++ vmm/remotes/deploy	2011-07-09 11:12:03.381164897 +0200
@@ -28,7 +28,12 @@
     exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+        VMWARERC_LOCATION="/etc/one/vmwarerc"
+else
+        VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+end
+load VMWARERC_LOCATION
 
 # Define the VM
 data = perform_action("virsh -c #{LIBVIRT_URI} define #{deployment_file}")
--- vmm/remotes/poll.orig	2011-07-09 11:10:31.252882449 +0200
+++ vmm/remotes/poll	2011-07-09 11:12:15.557166870 +0200
@@ -28,7 +28,12 @@
     exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+        VMWARERC_LOCATION="/etc/one/vmwarerc"
+else
+        VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+end
+load VMWARERC_LOCATION
 
 data = perform_action(
          "virsh -c #{LIBVIRT_URI} --readonly dominfo #{deploy_id}") 
--- vmm/remotes/restore.orig	2011-07-09 11:10:36.168418395 +0200
+++ vmm/remotes/restore	2011-07-09 11:12:25.889156035 +0200
@@ -28,7 +28,12 @@
   exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+        VMWARERC_LOCATION="/etc/one/vmwarerc"
+else
+        VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+end
+load VMWARERC_LOCATION
 
 # Define the VM
 deployment_file = File.dirname(File.dirname(file)) + "/deployment.0"
--- vmm/remotes/save.orig	2011-07-09 11:10:42.939289689 +0200
+++ vmm/remotes/save	2011-07-09 11:17:48.979614518 +0200
@@ -29,11 +29,18 @@
     exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+        VMWARERC_LOCATION="/etc/one/vmwarerc"
+        CHECKPOINT_LOCATION="/usr/lib/one/remotes/vmm/vmware/checkpoint"
+else
+        VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+        CHECKPOINT_LOCATION=ONE_LOCATION+"/lib/remotes/vmm/vmware/checkpoint"
+end
+load VMWARERC_LOCATION
 
 # Create snapshot
-checkpoint_xml_file = ENV['ONE_LOCATION'] + 
-                      "/lib/remotes/vmm/vmware/checkpoint"
+checkpoint_xml_file = CHECKPOINT_LOCATION
+
 data = perform_action(
   "virsh -c #{LIBVIRT_URI} snapshot-create #{deploy_id} #{checkpoint_xml_file}")
 
--- vmm/remotes/shutdown.orig	2011-07-09 11:10:47.031487238 +0200
+++ vmm/remotes/shutdown	2011-07-09 11:12:51.796898037 +0200
@@ -28,7 +28,12 @@
     exit -1
 end
 
-load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
+if !ONE_LOCATION
+        VMWARERC_LOCATION="/etc/one/vmwarerc"
+else
+        VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
+end
+load VMWARERC_LOCATION
 
 data = perform_action("virsh -c #{LIBVIRT_URI} shutdown #{deploy_id}")