This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch ghi10752-configCleanup in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 806c364061ec9d29f6236ffeec7f704c6d2b94b4 Author: Daan Hoogland <[email protected]> AuthorDate: Sat Aug 15 13:39:03 2026 +0200 move and restructure ManagementServer config items --- .../vmsnapshot/ScaleIOVMSnapshotStrategy.java | 4 +- .../com/cloud/ovm/hypervisor/OvmDiscoverer.java | 8 ++-- .../hypervisor/ovm3/resources/Ovm3Discoverer.java | 11 +++-- .../driver/ScaleIOPrimaryDataStoreDriver.java | 14 +++--- .../cloud/api/response/ApiResponseSerializer.java | 4 +- .../main/java/com/cloud/configuration/Config.java | 14 ------ .../kvm/discoverer/LibvirtServerDiscoverer.java | 7 +-- .../java/com/cloud/server/ManagementServer.java | 50 ++++++++++++++++++++++ .../com/cloud/server/ManagementServerImpl.java | 7 ++- 9 files changed, 77 insertions(+), 42 deletions(-) diff --git a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java index aced750bd32..59731e88324 100644 --- a/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java +++ b/engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/ScaleIOVMSnapshotStrategy.java @@ -47,7 +47,7 @@ import com.cloud.alert.AlertManager; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; import com.cloud.event.UsageEventVO; -import com.cloud.server.ManagementServerImpl; +import com.cloud.server.ManagementServer; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.Storage; import com.cloud.storage.Storage.ImageFormat; @@ -170,7 +170,7 @@ public class ScaleIOVMSnapshotStrategy extends ManagerBase implements VMSnapshot long virtual_size=0; for (VolumeObjectTO volume : volumeTOs) { String volumeSnapshotName = String.format("%s-%s-%s-%s-%s", ScaleIOUtil.VMSNAPSHOT_PREFIX, vmSnapshotVO.getId(), volume.getId(), - storagePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + storagePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); srcVolumeDestSnapshotMap.put(ScaleIOUtil.getVolumePath(volume.getPath()), volumeSnapshotName); virtual_size += volume.getSize(); diff --git a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java index 7dfd98301d7..7914b261aec 100644 --- a/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java +++ b/plugins/hypervisors/ovm/src/main/java/com/cloud/ovm/hypervisor/OvmDiscoverer.java @@ -31,7 +31,6 @@ import org.apache.xmlrpc.XmlRpcException; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; -import com.cloud.configuration.Config; import com.cloud.dc.ClusterVO; import com.cloud.dc.dao.ClusterDao; import com.cloud.exception.DiscoveryException; @@ -46,6 +45,7 @@ import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; +import com.cloud.server.ManagementServer; import com.cloud.utils.UuidUtils; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria; @@ -65,9 +65,9 @@ public class OvmDiscoverer extends DiscovererBase implements Discoverer, Resourc @Override public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { super.configure(name, params); - _publicNetworkDevice = _params.get(Config.OvmPublicNetwork.key()); - _privateNetworkDevice = _params.get(Config.OvmPrivateNetwork.key()); - _guestNetworkDevice = _params.get(Config.OvmGuestNetwork.key()); + _publicNetworkDevice = ManagementServer.OvmPublicNetwork.value(); + _privateNetworkDevice = ManagementServer.OvmPrivateNetwork.value(); + _guestNetworkDevice = ManagementServer.OvmGuestNetwork.value(); _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this); return true; } diff --git a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java index 52cc419ad2e..30a5b98176f 100755 --- a/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java +++ b/plugins/hypervisors/ovm3/src/main/java/com/cloud/hypervisor/ovm3/resources/Ovm3Discoverer.java @@ -38,7 +38,6 @@ import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupRoutingCommand; -import com.cloud.configuration.Config; import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.ClusterVO; import com.cloud.dc.dao.ClusterDao; @@ -58,6 +57,7 @@ import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; +import com.cloud.server.ManagementServer; import com.cloud.utils.UuidUtils; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.SearchCriteria; @@ -93,11 +93,10 @@ public class Ovm3Discoverer extends DiscovererBase implements Discoverer, return false; } - /* these are in Config.java */ - publicNetworkDevice = _params.get(Config.Ovm3PublicNetwork.key()); - privateNetworkDevice = _params.get(Config.Ovm3PrivateNetwork.key()); - guestNetworkDevice = _params.get(Config.Ovm3GuestNetwork.key()); - storageNetworkDevice = _params.get(Config.Ovm3StorageNetwork.key()); + publicNetworkDevice = ManagementServer.Ovm3PublicNetwork.value(); + privateNetworkDevice = ManagementServer.Ovm3PrivateNetwork.value(); + guestNetworkDevice = ManagementServer.Ovm3GuestNetwork.value(); + storageNetworkDevice = ManagementServer.Ovm3StorageNetwork.value(); resourceMgr.registerResourceStateAdapter(this.getClass() .getSimpleName(), this); return true; diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java index 0b257122404..636ed305692 100644 --- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java +++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java @@ -84,7 +84,7 @@ import com.cloud.exception.OperationTimedoutException; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; -import com.cloud.server.ManagementServerImpl; +import com.cloud.server.ManagementServer; import com.cloud.storage.DataStoreRole; import com.cloud.storage.ResizeVolumePayload; import com.cloud.storage.SnapshotVO; @@ -443,7 +443,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { final ScaleIOGatewayClient client = getScaleIOClient(storagePool); final String scaleIOVolumeId = ScaleIOUtil.getVolumePath(volumeVO.getPath()); String snapshotName = String.format("%s-%s-%s-%s", ScaleIOUtil.SNAPSHOT_PREFIX, snapshotInfo.getId(), - storagePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + storagePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); org.apache.cloudstack.storage.datastore.api.Volume scaleIOVolume = null; scaleIOVolume = client.takeSnapshot(scaleIOVolumeId, snapshotName); @@ -518,7 +518,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { final Long sizeInBytes = volumeInfo.getSize(); final long sizeInGb = (long) Math.ceil(sizeInBytes / (1024.0 * 1024.0 * 1024.0)); final String scaleIOVolumeName = String.format("%s-%s-%s-%s", ScaleIOUtil.VOLUME_PREFIX, volumeInfo.getId(), - storagePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + storagePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); org.apache.cloudstack.storage.datastore.api.Volume scaleIOVolume = null; scaleIOVolume = client.createVolume(scaleIOVolumeName, scaleIOStoragePoolId, (int) sizeInGb, volumeInfo.getProvisioningType()); @@ -600,7 +600,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { final Long sizeInBytes = templateInfo.getSize(); final long sizeInGb = (long) Math.ceil(sizeInBytes / (1024.0 * 1024.0 * 1024.0)); final String scaleIOVolumeName = String.format("%s-%s-%s-%s", ScaleIOUtil.TEMPLATE_PREFIX, templateInfo.getId(), - storagePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + storagePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); org.apache.cloudstack.storage.datastore.api.Volume scaleIOVolume = null; scaleIOVolume = client.createVolume(scaleIOVolumeName, scaleIOStoragePoolId, (int) sizeInGb, Storage.ProvisioningType.THIN); @@ -1016,7 +1016,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { String snapshotVolumeId = ScaleIOUtil.getVolumePath(snapshotStore.getInstallPath()); String newSnapshotName = String.format("%s-%s-%s-%s", ScaleIOUtil.SNAPSHOT_PREFIX, snapshot.getId(), - destStoragePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + destStoragePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); boolean renamed = client.renameVolume(snapshotVolumeId, newSnapshotName); snapshotStore.setDataStoreId(destPoolId); @@ -1150,7 +1150,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { boolean migrateStatus = client.migrateVolume(srcVolumeId, destStoragePoolId, migrationTimeout); if (migrateStatus) { String newVolumeName = String.format("%s-%s-%s-%s", ScaleIOUtil.VOLUME_PREFIX, destData.getId(), - destStoragePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + destStoragePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); boolean renamed = client.renameVolume(srcVolumeId, newVolumeName); if (srcData.getId() != destData.getId()) { @@ -1191,7 +1191,7 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver { String snapshotVolumeId = ScaleIOUtil.getVolumePath(snapshotStore.getInstallPath()); String newSnapshotName = String.format("%s-%s-%s-%s", ScaleIOUtil.SNAPSHOT_PREFIX, snapshot.getId(), - destStoragePool.getUuid().split("-")[0].substring(4), ManagementServerImpl.customCsIdentifier.value()); + destStoragePool.getUuid().split("-")[0].substring(4), ManagementServer.customCsIdentifier.value()); renamed = client.renameVolume(snapshotVolumeId, newSnapshotName); snapshotStore.setDataStoreId(destPoolId); diff --git a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java index bee9cbeb53a..30d0c0b96d8 100644 --- a/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java +++ b/server/src/main/java/com/cloud/api/response/ApiResponseSerializer.java @@ -20,7 +20,7 @@ import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiResponseGsonHelper; import com.cloud.api.ApiServer; import com.cloud.serializer.Param; -import com.cloud.server.ManagementServerImpl; +import com.cloud.server.ManagementServer; import com.cloud.user.Account; import com.cloud.utils.HttpUtils; import com.cloud.utils.encoding.URLEncoder; @@ -178,7 +178,7 @@ public class ApiResponseSerializer { log.append("<").append(result.getResponseName()); boolean authenticated = CallContext.current().getCallingAccount().getId() != Account.ACCOUNT_ID_SYSTEM; - if (ManagementServerImpl.exposeCloudStackVersionInApiXmlResponse.value() && authenticated) { + if (ManagementServer.exposeCloudStackVersionInApiXmlResponse.value() && authenticated) { sb.append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\""); log.append(" cloud-stack-version=\"").append(ApiDBUtils.getVersion()).append("\""); } diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java index c4656e4f805..f2f8be9e193 100644 --- a/server/src/main/java/com/cloud/configuration/Config.java +++ b/server/src/main/java/com/cloud/configuration/Config.java @@ -584,16 +584,7 @@ public enum Config { "5", "Incorrect login attempts allowed before the user is disabled (when value > 0). If value <=0 users are not disabled after failed login attempts", null), - // Ovm - OvmPublicNetwork("Hidden", ManagementServer.class, String.class, "ovm.public.network.device", null, "Specify the public bridge on host for public network", null), - OvmPrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm.private.network.device", null, "Specify the private bridge on host for private network", null), - OvmGuestNetwork("Hidden", ManagementServer.class, String.class, "ovm.guest.network.device", null, "Specify the private bridge on host for private network", null), - // Ovm3 - Ovm3PublicNetwork("Hidden", ManagementServer.class, String.class, "ovm3.public.network.device", null, "Specify the public bridge on host for public network", null), - Ovm3PrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm3.private.network.device", null, "Specify the private bridge on host for private network", null), - Ovm3GuestNetwork("Hidden", ManagementServer.class, String.class, "ovm3.guest.network.device", null, "Specify the guest bridge on host for guest network", null), - Ovm3StorageNetwork("Hidden", ManagementServer.class, String.class, "ovm3.storage.network.device", null, "Specify the storage bridge on host for storage network", null), Ovm3HeartBeatTimeout( "Advanced", ManagementServer.class, @@ -739,11 +730,6 @@ public enum Config { VmwareHungWorkerTimeout("Advanced", ManagementServer.class, Long.class, "vmware.hung.wokervm.timeout", "7200", "Worker VM timeout in seconds", null), VmwareVcenterSessionTimeout("Advanced", ManagementServer.class, Long.class, "vmware.vcenter.session.timeout", "1200", "VMware client timeout in seconds", null), - // KVM - KvmPublicNetwork("Hidden", ManagementServer.class, String.class, "kvm.public.network.device", null, "Specify the public bridge on host for public network", null), - KvmPrivateNetwork("Hidden", ManagementServer.class, String.class, "kvm.private.network.device", null, "Specify the private bridge on host for private network", null), - KvmGuestNetwork("Hidden", ManagementServer.class, String.class, "kvm.guest.network.device", null, "Specify the private bridge on host for private network", null), - // Hyperv HypervPublicNetwork( "Hidden", diff --git a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java index b9fa3f0ebae..e7dd3dea60e 100644 --- a/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java +++ b/server/src/main/java/com/cloud/hypervisor/kvm/discoverer/LibvirtServerDiscoverer.java @@ -62,6 +62,7 @@ import com.cloud.resource.DiscovererBase; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; +import com.cloud.server.ManagementServer; import com.cloud.utils.StringUtils; import com.cloud.utils.UuidUtils; import com.cloud.utils.exception.CloudRuntimeException; @@ -380,17 +381,17 @@ public abstract class LibvirtServerDiscoverer extends DiscovererBase implements public boolean configure(String name, Map<String, Object> params) throws ConfigurationException { // _setupAgentPath = Script.findScript(getPatchPath(), // "setup_agent.sh"); - _kvmPrivateNic = _configDao.getValue(Config.KvmPrivateNetwork.key()); + _kvmPrivateNic = ManagementServer.KvmPrivateNetwork.value(); if (_kvmPrivateNic == null) { _kvmPrivateNic = "cloudbr0"; } - _kvmPublicNic = _configDao.getValue(Config.KvmPublicNetwork.key()); + _kvmPublicNic = ManagementServer.KvmPublicNetwork.value(); if (_kvmPublicNic == null) { _kvmPublicNic = _kvmPrivateNic; } - _kvmGuestNic = _configDao.getValue(Config.KvmGuestNetwork.key()); + _kvmGuestNic = ManagementServer.KvmGuestNetwork.value(); if (_kvmGuestNic == null) { _kvmGuestNic = _kvmPrivateNic; } diff --git a/server/src/main/java/com/cloud/server/ManagementServer.java b/server/src/main/java/com/cloud/server/ManagementServer.java index 3932006c292..ca81aab3afc 100644 --- a/server/src/main/java/com/cloud/server/ManagementServer.java +++ b/server/src/main/java/com/cloud/server/ManagementServer.java @@ -16,6 +16,10 @@ // under the License. package com.cloud.server; +import java.util.UUID; + +import org.apache.cloudstack.framework.config.ConfigKey; + import com.cloud.agent.api.Answer; import com.cloud.host.DetailVO; import com.cloud.host.Host; @@ -31,6 +35,52 @@ import com.cloud.vm.VirtualMachine; */ public interface ManagementServer extends ManagementService, PluggableService { + ConfigKey<String> customCsIdentifier = new ConfigKey<>("Advanced", String.class, "custom.cs.identifier", + UUID.randomUUID().toString().split("-")[0].substring(4), "Custom identifier for the cloudstack installation", true, ConfigKey.Scope.Global); + + ConfigKey<Boolean> exposeCloudStackVersionInApiXmlResponse = new ConfigKey<>("Advanced", Boolean.class, "expose.cloudstack.version.api.xml.response", "true", + "Indicates whether ACS version should appear in the root element of an API XML response.", true, ConfigKey.Scope.Global); + + ConfigKey<String> OvmPublicNetwork = new ConfigKey<>("Hidden", String.class, + "ovm.public.network.device", null, + "Specify the public bridge on host for public network", true); + + ConfigKey<String> OvmPrivateNetwork = new ConfigKey<>("Hidden", String.class, + "ovm.private.network.device", null, + "Specify the private bridge on host for private network", true); + + ConfigKey<String> OvmGuestNetwork = new ConfigKey<>("Hidden", String.class, + "ovm.guest.network.device", null, + "Specify the private bridge on host for private network", true); + + ConfigKey<String> Ovm3PublicNetwork = new ConfigKey<>("Hidden", String.class, + "ovm3.public.network.device", null, + "Specify the public bridge on host for public network", true); + + ConfigKey<String> Ovm3PrivateNetwork = new ConfigKey<>("Hidden", String.class, + "ovm3.private.network.device", null, + "Specify the private bridge on host for private network", true); + + ConfigKey<String> Ovm3GuestNetwork = new ConfigKey<>("Hidden", String.class, + "ovm3.guest.network.device", null, + "Specify the guest bridge on host for guest network", true); + + ConfigKey<String> Ovm3StorageNetwork = new ConfigKey<>("Hidden", String.class, + "ovm3.storage.network.device", null, + "Specify the storage bridge on host for storage network", true); + + ConfigKey<String> KvmPublicNetwork = new ConfigKey<>("Hidden", String.class, + "kvm.public.network.device", null, + "Specify the public bridge on host for public network", true); + + ConfigKey<String> KvmPrivateNetwork = new ConfigKey<>("Hidden", String.class, + "kvm.private.network.device", null, + "Specify the private bridge on host for private network", true); + + ConfigKey<String> KvmGuestNetwork = new ConfigKey<>("Hidden", String.class, + "kvm.guest.network.device", null, + "Specify the private bridge on host for private network", true); + /** * returns the instance id of this management server. * diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index cda15f1818c..2d5eb64ba27 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -31,7 +31,6 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.Set; -import java.util.UUID; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; @@ -893,8 +892,6 @@ public class ManagementServerImpl extends MutualExclusiveIdsManagerBase implemen static final ConfigKey<Integer> vmPasswordLength = new ConfigKey<>("Advanced", Integer.class, "vm.password.length", "6", "Specifies the length of a randomly generated password", false); static final ConfigKey<Integer> sshKeyLength = new ConfigKey<>("Advanced", Integer.class, "ssh.key.length", "2048", "Specifies custom SSH key length (bit)", true, ConfigKey.Scope.Global); static final ConfigKey<Boolean> humanReadableSizes = new ConfigKey<>("Advanced", Boolean.class, "display.human.readable.sizes", "true", "Enables outputting human readable byte sizes to logs and usage records.", false, ConfigKey.Scope.Global); - public static final ConfigKey<String> customCsIdentifier = new ConfigKey<>("Advanced", String.class, "custom.cs.identifier", UUID.randomUUID().toString().split("-")[0].substring(4), "Custom identifier for the cloudstack installation", true, ConfigKey.Scope.Global); - public static final ConfigKey<Boolean> exposeCloudStackVersionInApiXmlResponse = new ConfigKey<>("Advanced", Boolean.class, "expose.cloudstack.version.api.xml.response", "true", "Indicates whether ACS version should appear in the root element of an API XML response.", true, ConfigKey.Scope.Global); public static final ConfigKey<Boolean> exposeCloudStackVersionInApiListCapabilities = new ConfigKey<>("Advanced", Boolean.class, "expose.cloudstack.version.api.list.capabilities", "true", "Indicates whether ACS version should show in the listCapabilities API.", true, ConfigKey.Scope.Global); private static final VirtualMachine.Type []systemVmTypes = { VirtualMachine.Type.SecondaryStorageVm, VirtualMachine.Type.ConsoleProxy}; @@ -4448,7 +4445,9 @@ public class ManagementServerImpl extends MutualExclusiveIdsManagerBase implemen @Override public ConfigKey<?>[] getConfigKeys() { - return new ConfigKey<?>[] {exposeCloudStackVersionInApiXmlResponse, exposeCloudStackVersionInApiListCapabilities, vmPasswordLength, sshKeyLength, humanReadableSizes, customCsIdentifier}; + return new ConfigKey<?>[] {exposeCloudStackVersionInApiXmlResponse, exposeCloudStackVersionInApiListCapabilities, vmPasswordLength, sshKeyLength, humanReadableSizes, customCsIdentifier, + OvmPublicNetwork, OvmPrivateNetwork, OvmGuestNetwork, Ovm3PublicNetwork, Ovm3PrivateNetwork, Ovm3GuestNetwork, Ovm3StorageNetwork, + KvmPublicNetwork, KvmPrivateNetwork, KvmGuestNetwork}; } protected class EventPurgeTask extends ManagedContextRunnable {
