apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove patch for ovm agent due to license incompatible

Browse Source 
will keep them in another place
This commit is contained in:
frank 2012-09-13 13:42:29 -07:00
parent 59de1fa99d
commit 7f8a1aabbf
3 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch
View File

@ -1,13 +0,0 @@
diff --git a/OVSXUtility.py b/OVSXUtility.py
index 4a98bc8..1053ef7 100644
--- a/OVSXUtility.py
+++ b/OVSXUtility.py
@@ -160,7 +160,7 @@ def get_storage_repos():
l = parse_storage_repos()
for sr in l:
d = get_storage_free_space(sr)
- if d:
+ if len(d) > 0:
d_repos_space[sr] = d[sr]
if not d_repos_space:

13
plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch
View File

@ -1,13 +0,0 @@
diff --git a/OVSAgentAutoStart.py b/OVSAgentAutoStart.py
index 88fa18c..794a363 100755
--- a/OVSAgentAutoStart.py
+++ b/OVSAgentAutoStart.py
@@ -111,8 +111,6 @@ def prepare_cluster_heartbeat():
JOBS = [
["command", join(dirname(__file__), "utils/upgrade_agent.py")],
["function", "get_agent_version", ()],
- ["function", "prepare_cluster_root", ()],
- ["function", "prepare_cluster_heartbeat", ()],
["command", join(dirname(__file__), "utils/upgrade.py")],
["command_bg", join(dirname(__file__), "OVSRemasterServer.py")],
["command_bg", join(dirname(__file__), "OVSMonitorServer.py")],

23
plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch
View File

@ -1,23 +0,0 @@
*** OVSServices.py 2011-06-06 12:31:23.279919998 -0700
--- /tmp/OVSServices.py 2011-06-06 12:32:13.275919997 -0700
***************
*** 68,73 ****
--- 68,75 ----
import OVSVMXParser #pylint: disable-msg=W0611
import OVSVMDKParser #pylint: disable-msg=W0611
+ import OvmDispatcher
+
from OVSWrappers import D
from OVSCommons import exposed
***************
*** 113,118 ****
--- 115,121 ----
self.sleep = sleep
self._load_modules()
+ OvmDispatcher.InitOvmDispacther()
# #xenapi
# import xen.xend.XendAPI as XendAPI