This is an automated email from the ASF dual-hosted git repository. DaanHoogland pushed a commit to branch ghi10752-config-foundation in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f121d65387e6c9a8cfe49b6f8cfad62593c9f8c6 Author: Daan Hoogland <[email protected]> AuthorDate: Fri Oct 23 16:57:21 2026 +0200 fix config descriptions and the NetworkLBHaproxyStatsVisibility name Co-Authored-By: Claude Opus 5.5 <[email protected]> --- api/src/main/java/com/cloud/storage/VolumeApiService.java | 4 ++-- .../engine/orchestration/service/NetworkOrchestrationService.java | 2 +- .../src/main/java/com/cloud/template/TemplateManager.java | 2 +- .../src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java | 2 +- .../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +- server/src/main/java/com/cloud/server/ManagementServer.java | 2 +- server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/src/main/java/com/cloud/storage/VolumeApiService.java b/api/src/main/java/com/cloud/storage/VolumeApiService.java index d70c2362ed3..eb20e359597 100644 --- a/api/src/main/java/com/cloud/storage/VolumeApiService.java +++ b/api/src/main/java/com/cloud/storage/VolumeApiService.java @@ -64,10 +64,10 @@ public interface VolumeApiService { ConfigKey.Scope.Zone); ConfigKey<Integer> CopyVolumeWait = new ConfigKey<>("Storage", Integer.class, "copy.volume.wait", "10800", - "In second, timeout for copy volume command", true); + "Timeout (in seconds) for the copy volume command", true); ConfigKey<Integer> CreateVolumeFromSnapshotWait = new ConfigKey<>("Storage", Integer.class, "create.volume.from.snapshot.wait", "10800", - "In second, timeout for creating volume from snapshot", true); + "Timeout (in seconds) for creating a volume from a snapshot", true); ConfigKey<Long> MaxUploadVolumeSize = new ConfigKey<>("Storage", Long.class, "storage.max.volume.upload.size", "500", "The maximum size for a uploaded volume(in GB).", true); diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java index e1fdf0b06b4..fc04d32e04f 100644 --- a/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java +++ b/engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/NetworkOrchestrationService.java @@ -141,7 +141,7 @@ public interface NetworkOrchestrationService { ConfigKey<Integer> VmNetworkThrottlingRate = new ConfigKey<Integer>("Network", Integer.class, "vm.network.throttling.rate", "200", "Default data transfer rate in megabits per second allowed in User vm's default network.", true, ConfigKey.Scope.Zone); - ConfigKey<String> NetworkLBHaproxyStatsVisbility = new ConfigKey<>("Network", String.class, + ConfigKey<String> NetworkLBHaproxyStatsVisibility = new ConfigKey<>("Network", String.class, "network.loadbalancer.haproxy.stats.visibility", "global", "Load Balancer(haproxy) stats visibility, the value can be one of the following six parameters : global,guest-network,link-local,disabled,all,default", true, ConfigKey.Kind.Select, "global,guest-network,link-local,disabled,all,default"); diff --git a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java index 1b97c1d73b1..aa5a4d5c17a 100644 --- a/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java +++ b/engine/components-api/src/main/java/com/cloud/template/TemplateManager.java @@ -92,7 +92,7 @@ public interface TemplateManager { ConfigKey<Integer> CreatePrivateTemplateFromSnapshotWait = new ConfigKey<>("Storage", Integer.class, "create.private.template.from.snapshot.wait", "10800", - "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", true); + "Timeout (in seconds) for CreatePrivateTemplateFromSnapshotCommand", true); // KVM/libvirt maps deviceSeq=3 to hdc (hda/hdb are taken by the root volume on i440fx/IDE). // user_vm.iso_id has always pointed at this slot; additional cdroms live in vm_iso_map. diff --git a/engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java b/engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java index 24c165db268..6e33e0c47f6 100644 --- a/engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java +++ b/engine/components-api/src/main/java/com/cloud/vm/snapshot/VMSnapshotManager.java @@ -34,7 +34,7 @@ public interface VMSnapshotManager extends VMSnapshotService, Manager { ConfigKey<Integer> VMSnapshotMax = new ConfigKey<Integer>("Advanced", Integer.class, "vmsnapshot.max", "10", "Maximum VM snapshots for a single VM", true, ConfigKey.Scope.Account); ConfigKey<Integer> VMSnapshotCreateWait = new ConfigKey<>("Advanced", Integer.class, "vmsnapshot.create.wait", "1800", - "In second, timeout for create vm snapshot", true); + "Timeout (in seconds) for VM snapshot creation", true); /** * Delete all VM snapshots belonging to one VM diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java index aa6cd22417e..d762ab126b9 100644 --- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java +++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java @@ -5289,7 +5289,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra GuestDomainSuffix, NetworkThrottlingRate, VmNetworkThrottlingRate, MinVRVersion, DhcpLeaseTimeout, PromiscuousMode, MacAddressChanges, ForgedTransmits, MacLearning, RollingRestartEnabled, TUNGSTEN_ENABLED, NSX_ENABLED, NETRIS_ENABLED, NETWORK_LB_HAPROXY_MAX_CONN, - NETWORK_LB_HAPROXY_IDLE_TIMEOUT, MultiNetworkNicEnabled, NetworkLBHaproxyStatsVisbility, + NETWORK_LB_HAPROXY_IDLE_TIMEOUT, MultiNetworkNicEnabled, NetworkLBHaproxyStatsVisibility, NetworkLBHaproxyStatsUri, NetworkLBHaproxyStatsAuth, NetworkLBHaproxyStatsPort}; } } diff --git a/server/src/main/java/com/cloud/server/ManagementServer.java b/server/src/main/java/com/cloud/server/ManagementServer.java index 3b3a27af5d6..d427998ffb8 100644 --- a/server/src/main/java/com/cloud/server/ManagementServer.java +++ b/server/src/main/java/com/cloud/server/ManagementServer.java @@ -101,7 +101,7 @@ public interface ManagementServer extends ManagementService, PluggableService { "enable or disable publishing of alert events on the event bus", true); ConfigKey<Boolean> PublishResourceStateEvent = new ConfigKey<>("Advanced", Boolean.class, "publish.resource.state.events", "true", - "enable or disable publishing of alert events on the event bus", true); + "enable or disable publishing of resource state events on the event bus", true); ConfigKey<Boolean> PublishUsageEvent = new ConfigKey<>("Advanced", Boolean.class, "publish.usage.events", "true", "enable or disable publishing of usage events on the event bus", true); diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java index fe2e9bdb719..8e45a706d65 100644 --- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java +++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManager.java @@ -73,7 +73,7 @@ public interface SnapshotManager extends Configurable { true, ConfigKey.Scope.StoragePool, null); ConfigKey<Integer> BackupSnapshotWait = new ConfigKey<>("Storage", Integer.class, "backup.snapshot.wait", "21600", - "In second, timeout for BackupSnapshotCommand", true); + "Timeout (in seconds) for BackupSnapshotCommand", true); ConfigKey<Integer> TotalRetries = new ConfigKey<>("Storage", Integer.class, "total.retries", "4", "The number of times each command sent to a host should be retried in case of failure.", true);
