You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/04/14 04:47:12 UTC
[1/2] git commit: updated refs/heads/master to a80c286
Repository: cloudstack
Updated Branches:
refs/heads/master d7c5994f0 -> a80c28699
BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/df799692
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/df799692
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/df799692
Branch: refs/heads/master
Commit: df7996924fc9dc48675f86171c63d409bbba82da
Parents: d7c5994
Author: Kishan Kavala <ki...@apache.org>
Authored: Thu Mar 30 17:15:46 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Wed Apr 12 15:08:16 2017 +0530
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade4920to41000.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/df799692/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to41000.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to41000.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to41000.java
index 8481abf..521fcdc 100644
--- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to41000.java
+++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade4920to41000.java
@@ -84,6 +84,12 @@ public class Upgrade4920to41000 implements DbUpgrade {
case Hyperv:
hypervisorsListInUse.add(Hypervisor.HypervisorType.Hyperv);
break;
+ case LXC:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.LXC);
+ break;
+ case Ovm3:
+ hypervisorsListInUse.add(Hypervisor.HypervisorType.Ovm3);
+ break;
default: // no action on cases Any, BareMetal, None, Ovm,
// Parralels, Simulator and VirtualBox:
break;
@@ -100,6 +106,8 @@ public class Upgrade4920to41000 implements DbUpgrade {
put(Hypervisor.HypervisorType.VMware, "systemvm-vmware-4.10");
put(Hypervisor.HypervisorType.KVM, "systemvm-kvm-4.10");
put(Hypervisor.HypervisorType.Hyperv, "systemvm-hyperv-4.10");
+ put(Hypervisor.HypervisorType.LXC, "systemvm-lxc-4.10");
+ put(Hypervisor.HypervisorType.Ovm3, "systemvm-ovm3-4.10");
}
};
@@ -109,6 +117,8 @@ public class Upgrade4920to41000 implements DbUpgrade {
put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
put(Hypervisor.HypervisorType.KVM, "router.template.kvm");
put(Hypervisor.HypervisorType.Hyperv, "router.template.hyperv");
+ put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
+ put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
}
};
@@ -118,6 +128,8 @@ public class Upgrade4920to41000 implements DbUpgrade {
put(Hypervisor.HypervisorType.VMware, "https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-vmware.ova");
put(Hypervisor.HypervisorType.KVM, "https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2");
put(Hypervisor.HypervisorType.Hyperv, "https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-hyperv.vhd.zip");
+ put(Hypervisor.HypervisorType.LXC, "https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2");
+ put(Hypervisor.HypervisorType.Ovm3, "https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-ovm.raw.bz2");
}
};
@@ -127,6 +139,8 @@ public class Upgrade4920to41000 implements DbUpgrade {
put(Hypervisor.HypervisorType.VMware, "970bfb070a80bd74820881d8149643c1");
put(Hypervisor.HypervisorType.KVM, "bc2eac46f16a2ece6c19d4b89db41de3");
put(Hypervisor.HypervisorType.Hyperv, "0adb35bd9f92e80d3fc63fcdd9bb55e5");
+ put(Hypervisor.HypervisorType.LXC, "bc2eac46f16a2ece6c19d4b89db41de3");
+ put(Hypervisor.HypervisorType.Ovm3, "94a41f0a5361933813bb34a51df56f56");
}
};
[2/2] git commit: updated refs/heads/master to a80c286
Posted by ra...@apache.org.
Merge pull request #2023 from Accelerite/CLOUDSTACK-9808
BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM`
> mysql> select id,unique_name,name,type,url,updated,created from vm_template where type='SYSTEM';
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> | id | unique_name | name | type | url | updated | created |
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> | 1 | routing-1 | SystemVM Template (XenServer) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-xen.vhd.bz2 | NULL | 2017-03-30 15:53:00 |
> | 3 | routing-3 | SystemVM Template (KVM) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2 | NULL | 2017-03-30 15:53:00 |
> | 8 | routing-8 | SystemVM Template (vSphere) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-vmware.ova | NULL | 2017-03-30 15:53:00 |
> | 9 | routing-9 | SystemVM Template (HyperV) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-hyperv.vhd.zip | NULL | 2017-03-30 15:53:00 |
> | 10 | routing-10 | SystemVM Template (LXC) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-kvm.qcow2.bz2 | NULL | 2017-03-30 15:54:13 |
> | 12 | routing-12 | SystemVM Template (Ovm3) | SYSTEM | https://download.cloudstack.org/systemvm/4.10/systemvm64template-master-4.10.0-ovm.raw.bz2 | NULL | 2017-03-30 15:55:58 |
> +----+-------------+-------------------------------+--------+-----------------------------------------------------------------------------------------------+---------+---------------------+
> 6 rows in set (0.00 sec)
`
* pr/2023:
BUG-ID: CLOUDSTACK-9808 Added system Vm upgrade path for LXC and OVM
Signed-off-by: Rajani Karuturi <ra...@accelerite.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a80c2869
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a80c2869
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a80c2869
Branch: refs/heads/master
Commit: a80c28699951aff9f374097767f813644f3e30e2
Parents: d7c5994 df79969
Author: Rajani Karuturi <ra...@accelerite.com>
Authored: Fri Apr 14 10:14:52 2017 +0530
Committer: Rajani Karuturi <ra...@accelerite.com>
Committed: Fri Apr 14 10:14:53 2017 +0530
----------------------------------------------------------------------
.../src/com/cloud/upgrade/dao/Upgrade4920to41000.java | 14 ++++++++++++++
1 file changed, 14 insertions(+)
----------------------------------------------------------------------