cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [06/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab
Date Wed, 22 Jan 2014 19:27:31 GMT
CLOUDSTACK-5892: Disabled removal of old system Vm templates during upgrades. Updated hyperV
template URL and checksum


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c8f6ec04
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c8f6ec04
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c8f6ec04

Branch: refs/heads/rbac
Commit: c8f6ec043d31b60923a8391d9e031033ff69493c
Parents: 98183e9
Author: Kishan Kavala <kishan@cloud.com>
Authored: Fri Jan 17 17:12:19 2014 +0530
Committer: Kishan Kavala <kishan@cloud.com>
Committed: Fri Jan 17 17:13:40 2014 +0530

----------------------------------------------------------------------
 .../src/com/cloud/upgrade/dao/Upgrade421to430.java    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f6ec04/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
index a9735c3..599c1fb 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade421to430.java
@@ -237,7 +237,7 @@ public class Upgrade421to430 implements DbUpgrade {
 
             Map<Hypervisor.HypervisorType, String> newTemplateUrl = new HashMap<Hypervisor.HypervisorType,
String>(){
                 {   put(Hypervisor.HypervisorType.XenServer, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-xen.vhd.bz2");
-                    put(Hypervisor.HypervisorType.VMware, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vh7.ova");
+                    put(Hypervisor.HypervisorType.VMware, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-vmware.ova");
                     put(Hypervisor.HypervisorType.KVM, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2");
                     put(Hypervisor.HypervisorType.LXC, "http://download.cloud.com/templates/4.3/systemvm64template-2014-01-14-master-kvm.qcow2.bz2");
                     put(Hypervisor.HypervisorType.Hyperv, "http://download.cloud.com/templates/4.3/systemvm64template-2013-12-23-hyperv.vhd.bz2");
@@ -246,7 +246,7 @@ public class Upgrade421to430 implements DbUpgrade {
 
             Map<Hypervisor.HypervisorType, String> newTemplateChecksum = new HashMap<Hypervisor.HypervisorType,
String>(){
                 {   put(Hypervisor.HypervisorType.XenServer, "74b92f031cc5c2089ee89efb81344dcf");
-                    put(Hypervisor.HypervisorType.VMware, "8fde62b1089e5844a9cd3b9b953f9596");
+                    put(Hypervisor.HypervisorType.VMware, "ef593a061f3b7594ab0bfd9b0ed0a0d4");
                     put(Hypervisor.HypervisorType.KVM, "85a1bed07bf43cbf022451cb2ecae4ff");
                     put(Hypervisor.HypervisorType.LXC, "85a1bed07bf43cbf022451cb2ecae4ff");
                     put(Hypervisor.HypervisorType.Hyperv, "5df45ee6ebe1b703a8805f4e1f4d0818");
@@ -264,11 +264,11 @@ public class Upgrade421to430 implements DbUpgrade {
                         long templateId = rs.getLong(1);
                         rs.close();
                         pstmt.close();
-                        // Mark the old system templates as removed
-                        pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET removed
= now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null");
-                        pstmt.setString(1, hypervisorAndTemplateName.getKey().toString());
-                        pstmt.executeUpdate();
-                        pstmt.close();
+//                        // Mark the old system templates as removed
+//                        pstmt = conn.prepareStatement("UPDATE `cloud`.`vm_template` SET
removed = now() WHERE hypervisor_type = ? AND type = 'SYSTEM' AND removed is null");
+//                        pstmt.setString(1, hypervisorAndTemplateName.getKey().toString());
+//                        pstmt.executeUpdate();
+//                        pstmt.close();
                         // change template type to SYSTEM
                         pstmt = conn.prepareStatement("update `cloud`.`vm_template` set type='SYSTEM'
where id = ?");
                         pstmt.setLong(1, templateId);


Mime
View raw message