cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [17/25] git commit: updated refs/heads/ui-mixed-zone-management to c3009e3
Date Wed, 17 Apr 2013 18:09:28 GMT
Add LXC to hypervisor.list configuration value on fresh install

Signed-off-by: Edison Su <sudison@gmail.com>


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

Branch: refs/heads/ui-mixed-zone-management
Commit: d0a7eae5d97da777ad468b1b25fb9e3bb8b013a8
Parents: 0ddeb65
Author: Phong Nguyen <pnguyen@gilt.com>
Authored: Mon Apr 15 13:31:43 2013 -0400
Committer: Edison Su <sudison@gmail.com>
Committed: Tue Apr 16 23:28:58 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/configuration/Config.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d0a7eae5/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index e69ea19..2993966 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -196,7 +196,7 @@ public enum Config {
 	CPUOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "cpu.overprovisioning.factor",
"1", "Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity
* cpu.overprovisioning.factor)", null),
 	MemOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "mem.overprovisioning.factor",
"1", "Used for memory overprovisioning calculation", null),
 	LinkLocalIpNums("Advanced", ManagementServer.class, Integer.class, "linkLocalIp.nums", "10",
"The number of link local ip that needed by domR(in power of 2)", null),
-	HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM
+ "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal
+ "," + HypervisorType.Ovm, "The list of hypervisors that this deployment will use.", "hypervisorList"),
+	HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM
+ "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal
+ "," + HypervisorType.Ovm + "," + HypervisorType.LXC, "The list of hypervisors that this
deployment will use.", "hypervisorList"),
 	ManagementHostIPAdr("Advanced", ManagementServer.class, String.class, "host", "localhost",
"The ip address of management server", null),
 	ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr",
null, "The cidr of management server network", null),
 	EventPurgeDelay("Advanced", ManagementServer.class, Integer.class, "event.purge.delay",
"15", "Events older than specified number days will be purged. Set this value to 0 to never
delete events", null),


Mime
View raw message