From cb024e3bf20919d2fdb6624cf6d013a68eccc017 Mon Sep 17 00:00:00 2001 From: anthony Date: Fri, 28 Jan 2011 12:46:50 -0800 Subject: [PATCH] remove prealloclun --- server/src/com/cloud/configuration/Config.java | 1 - .../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 8 +------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 5df4963fb75..5b84b4787f1 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -177,7 +177,6 @@ public enum Config { XenSetupMultipath("Advanced", ManagementServer.class, String.class, "xen.setup.multipath", "false", "Setup the host to do multipath", null), XenBondStorageNic("Advanced", ManagementServer.class, String.class, "xen.bond.storage.nics", null, "Attempt to bond the two networks if found", null), XenHeartBeatInterval("Advanced", ManagementServer.class, Integer.class, "xen.heartbeat.interval", "60", "heartbeat to use when implementing XenServer Self Fencing", null), - XenPreallocatedLunSizeRange("Advanced", ManagementServer.class, Float.class, "xen.preallocated.lun.size.range", ".05", "percentage to add to disk size when allocating", null), XenGuestNetwork("Advanced", ManagementServer.class, String.class, "xen.guest.network.device", null, "Specify for guest network name label", null), // VMware diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 4d8739c5db9..40fec9de72b 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -84,7 +84,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L protected String _storageNic2; protected int _wait; protected XenServerConnectionPool _connPool; - protected String _increase; protected boolean _checkHvm; protected String _guestNic; @@ -234,9 +233,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L params.put("pool", poolUuid); params.put("ipaddress", record.address); - if (_increase != null) { - params.put(Config.XenPreallocatedLunSizeRange.name(), _increase); - } details.put(HostInfo.HOST_OS, hostOS); details.put(HostInfo.HOST_OS_VERSION, hostOSVer); details.put(HostInfo.HOST_OS_KERNEL_VERSION, hostKernelVer); @@ -397,9 +393,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L _storageNic2 = _params.get(Config.XenStorageNetwork2.key()); _guestNic = _params.get(Config.XenGuestNetwork.key()); - - _increase = _params.get(Config.XenPreallocatedLunSizeRange.key()); - + String value = _params.get(Config.Wait.toString()); _wait = NumbersUtil.parseInt(value, Integer.parseInt(Config.Wait.getDefaultValue()));