From eb2a3d6f8e0ec7df30164ed7b65d0f3c871bc110 Mon Sep 17 00:00:00 2001 From: will Date: Thu, 17 Mar 2011 11:31:36 -0700 Subject: [PATCH] bug 8208: Added support for adding baremetal clusters and baremetal templates. --- server/src/com/cloud/configuration/Config.java | 2 +- ui/scripts/cloud.core.template.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 010220885f2..8ee24b17600 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -142,7 +142,7 @@ public enum Config { SystemVMAutoReserveCapacity("Advanced", ManagementServer.class, Boolean.class, "system.vm.auto.reserve.capacity", "true", "Indicates whether or not to automatically reserver system VM standby capacity.", null), CPUOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "cpu.overprovisioning.factor", "1", "Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity * cpu.overprovisioning.factor)", 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, "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, "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), diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index dd8b96ad461..ac785177a35 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -82,6 +82,8 @@ function afterLoadTemplateJSP() { formatSelect.append(""); else if(selectedHypervisorType == "KVM") formatSelect.append(""); + else if(selectedHypervisorType == "BareMetal") + formatSelect.append(""); return false; });