You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ki...@apache.org on 2014/03/11 19:19:49 UTC
[1/2] git commit: updated refs/heads/master to c63f43a
Repository: cloudstack
Updated Branches:
refs/heads/master 415e4bffd -> c63f43a9c
CLOUDSTACK-6122: Add LXC to supported hypervisor list for VPC
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c63f43a9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c63f43a9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c63f43a9
Branch: refs/heads/master
Commit: c63f43a9ccf13466e355902916020ddd2b7e72cb
Parents: 6d4b979
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 11 23:00:24 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Tue Mar 11 23:49:28 2014 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c63f43a9/server/src/com/cloud/network/vpc/VpcManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index 762cc6f..fe49981 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -2179,6 +2179,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
hTypes.add(HypervisorType.VMware);
hTypes.add(HypervisorType.KVM);
hTypes.add(HypervisorType.Simulator);
+ hTypes.add(HypervisorType.LXC);
return hTypes;
}
[2/2] git commit: updated refs/heads/master to c63f43a
Posted by ki...@apache.org.
CLOUDSTACK-6122: LXC systemVms run on KVM. If they are not included in the VmState report, MS assumes that system Vms are not running. MS will stop these Vms and spin new ones. So on LXC hosts, KVM Vms also have to be included in the Vmlist
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d4b979c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d4b979c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d4b979c
Branch: refs/heads/master
Commit: 6d4b979c4d0afee85d3244e07e6233ee8784db4f
Parents: 415e4bf
Author: Kishan Kavala <ki...@cloud.com>
Authored: Tue Mar 11 22:58:41 2014 +0530
Committer: Kishan Kavala <ki...@cloud.com>
Committed: Tue Mar 11 23:49:28 2014 +0530
----------------------------------------------------------------------
.../cloud/hypervisor/kvm/resource/LibvirtComputingResource.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d4b979c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index f4f6c74..3a5d27c 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -4384,6 +4384,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
try {
conn = LibvirtConnection.getConnectionByType(HypervisorType.LXC.toString());
vmStates.putAll(getAllVms(conn));
+ conn = LibvirtConnection.getConnectionByType(HypervisorType.KVM.toString());
+ vmStates.putAll(getAllVms(conn));
} catch (LibvirtException e) {
s_logger.debug("Failed to get connection: " + e.getMessage());
}
@@ -4480,6 +4482,8 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv
try {
conn = LibvirtConnection.getConnectionByType(HypervisorType.LXC.toString());
vmStates.putAll(getHostVmStateReport(conn));
+ conn = LibvirtConnection.getConnectionByType(HypervisorType.KVM.toString());
+ vmStates.putAll(getHostVmStateReport(conn));
} catch (LibvirtException e) {
s_logger.debug("Failed to get connection: " + e.getMessage());
}