|
[-]
[+]
|
Changed |
opennebula-driver-vmware.spec
|
|
|
|
[-]
[+]
|
Deleted |
vmware-imRemotesVmwareRCfix.patch
^
|
| @@ -1,22 +0,0 @@
---- im/remotes/vmware.rb.orig 2011-07-09 01:32:12.855567990 +0200
-+++ im/remotes/vmware.rb 2011-07-09 01:32:59.886148818 +0200
-@@ -4,8 +4,10 @@
-
- if !ONE_LOCATION
- RUBY_LIB_LOCATION="/usr/lib/one/ruby"
-+ VMWARERC_LOCATION="/etc/one/vmwarerc"
- else
- RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
-+ VMWARERC_LOCATION=ONE_LOCATION+"/etc/vmwarerc"
- end
-
- $: << RUBY_LIB_LOCATION
-@@ -58,7 +60,7 @@
- exit -1
- end
-
--load ENV['ONE_LOCATION'] + "/etc/vmwarerc"
-+load VMWARERC_LOCATION
-
- data = perform_action("virsh -c #{LIBVIRT_URI} --readonly nodeinfo")
-
|
|
[-]
[+]
|
Deleted |
vmware-vmm-remotes.patch
^
|
| @@ -1,104 +0,0 @@
---- 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}")
-
|
|
[-]
[+]
|
Deleted |
vmware-vmwarelib.patch
^
|
| @@ -1,31 +0,0 @@
---- lib/vmwarelib.rb.orig 2011-07-09 00:14:27.337368199 +0200
-+++ lib/vmwarelib.rb 2011-07-09 01:55:45.499981783 +0200
-@@ -23,14 +23,16 @@
- # Set up the environment for the driver #
- # ---------------------------------------------------------------------------- #
-
--ONE_LOCATION = ENV["ONE_LOCATION"]
-+#ONE_LOCATION = ENV["ONE_LOCATION"]
-
- if !ONE_LOCATION
-- RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
-+# RUBY_LIB_LOCATION = "/usr/lib/one/ruby"
- ETC_LOCATION = "/etc/one/"
-+ BIN_LOCATION = "/usr/bin"
- else
-- RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
-+# RUBY_LIB_LOCATION = ONE_LOCATION + "/lib/ruby"
- ETC_LOCATION = ONE_LOCATION + "/etc/"
-+ BIN_LOCATION = ONE_LOCATION + "/bin"
- end
-
- $: << RUBY_LIB_LOCATION
-@@ -43,7 +45,7 @@
-
- # Common functions
- def perform_action(command)
-- command = ENV['ONE_LOCATION'] + "/bin/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
-+ command = BIN_LOCATION + "/tty_expect -u " + USERNAME + " -p " + PASSWORD + " " + command
-
- action_result = LocalCommand.run(command)
-
|
