From c1c01e34da6001c041d4bdcd0dcf97aa4acbaa2d Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 22 Jan 2026 11:28:10 +0100 Subject: [PATCH 1/5] disable deprecated plugins --- plugins/pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/pom.xml b/plugins/pom.xml index 16e5ed1d8f59..ac194fcb769b 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -88,9 +88,7 @@ hypervisors/baremetal hypervisors/external - hypervisors/hyperv hypervisors/kvm - hypervisors/ucs hypervisors/xenserver integrations/cloudian From 8071ff35cb60a53ad4739052f33294809bb5e184 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 22 Jan 2026 11:58:55 +0100 Subject: [PATCH 2/5] remove hyperv from ui --- client/pom.xml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/client/pom.xml b/client/pom.xml index 94d844be3c42..e5bba50e57bb 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -316,11 +316,6 @@ cloud-plugin-hypervisor-baremetal ${project.version} - - org.apache.cloudstack - cloud-plugin-hypervisor-ucs - ${project.version} - org.apache.cloudstack cloud-plugin-hypervisor-kvm @@ -332,11 +327,6 @@ - - org.apache.cloudstack - cloud-plugin-hypervisor-hyperv - ${project.version} - org.apache.cloudstack cloud-plugin-hypervisor-external From dde3e1e352ce4722db08006f36e8dcc1abd2ac74 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 22 Jan 2026 14:16:46 +0100 Subject: [PATCH 3/5] remove ucsa vars --- .../java/org/apache/cloudstack/api/ApiConstants.java | 2 -- server/src/main/java/com/cloud/configuration/Config.java | 9 --------- 2 files changed, 11 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 944b111eb70c..038cf33b6907 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -1069,7 +1069,6 @@ public class ApiConstants { public static final String AUTOSCALE_VMGROUP_NAME = "autoscalevmgroupname"; public static final String BAREMETAL_DISCOVER_NAME = "baremetaldiscovername"; public static final String BAREMETAL_RCT_URL = "baremetalrcturl"; - public static final String UCS_DN = "ucsdn"; public static final String GSLB_PROVIDER = "gslbprovider"; public static final String EXCLUSIVE_GSLB_PROVIDER = "isexclusivegslbprovider"; public static final String GSLB_PROVIDER_PUBLIC_IP = "gslbproviderpublicip"; @@ -1086,7 +1085,6 @@ public class ApiConstants { public static final String GUEST_VM_CIDR = "guestvmcidr"; public static final String NETWORK_CIDR = "networkcidr"; public static final String RESERVED_IP_RANGE = "reservediprange"; - public static final String UCS_MANAGER_ID = "ucsmanagerid"; public static final String UCS_PROFILE_DN = "profiledn"; public static final String UCS_BLADE_DN = "bladedn"; public static final String UCS_BLADE_ID = "bladeid"; diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java index abae4d3996cb..a5bb17bc4ac5 100644 --- a/server/src/main/java/com/cloud/configuration/Config.java +++ b/server/src/main/java/com/cloud/configuration/Config.java @@ -1652,15 +1652,6 @@ public enum Config { + " If set to false, these commands become asynchronous. Default value is false.", null), - UCSSyncBladeInterval( - "Advanced", - ManagementServer.class, - Integer.class, - "ucs.sync.blade.interval", - "3600", - "the interval cloudstack sync with UCS manager for available blades in case user remove blades from chassis without notifying CloudStack", - null), - RedundantRouterVrrpInterval( "Advanced", NetworkOrchestrationService.class, From 5aea69f6144fc59f86e8fab642aeb094b543b83a Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Thu, 22 Jan 2026 15:36:54 +0100 Subject: [PATCH 4/5] remaining ucs vars removed --- api/src/main/java/org/apache/cloudstack/api/ApiConstants.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java index 038cf33b6907..e0ddc879da1e 100644 --- a/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/main/java/org/apache/cloudstack/api/ApiConstants.java @@ -1085,9 +1085,6 @@ public class ApiConstants { public static final String GUEST_VM_CIDR = "guestvmcidr"; public static final String NETWORK_CIDR = "networkcidr"; public static final String RESERVED_IP_RANGE = "reservediprange"; - public static final String UCS_PROFILE_DN = "profiledn"; - public static final String UCS_BLADE_DN = "bladedn"; - public static final String UCS_BLADE_ID = "bladeid"; public static final String VM_GUEST_IP = "vmguestip"; public static final String HEALTHCHECK_FAILED = "healthchecksfailed"; public static final String HEALTHCHECK_RESPONSE_TIMEOUT = "responsetimeout"; From 1d3bad0fecda4fba406f9fb8f0b5093cad266b9c Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 23 Jan 2026 14:55:09 +0100 Subject: [PATCH 5/5] remove var from configuration --- .../cloud/upgrade/dao/Upgrade42200to42210.java | 16 ++++++++++++++++ .../META-INF/db/schema-42200to42210.sql | 2 ++ 2 files changed, 18 insertions(+) diff --git a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42200to42210.java b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42200to42210.java index c9610f7b9ff5..d4e60d799435 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42200to42210.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42200to42210.java @@ -16,6 +16,10 @@ // under the License. package com.cloud.upgrade.dao; +import com.cloud.utils.exception.CloudRuntimeException; + +import java.io.InputStream; + public class Upgrade42200to42210 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate { @Override @@ -27,4 +31,16 @@ public String[] getUpgradableVersionRange() { public String getUpgradedVersion() { return "4.22.1.0"; } + + @Override + public InputStream[] getPrepareScripts() { + final String scriptFile = "META-INF/db/schema-42200to42210.sql"; + final InputStream script = Thread.currentThread().getContextClassLoader().getResourceAsStream(scriptFile); + if (script == null) { + throw new CloudRuntimeException("Unable to find " + scriptFile); + } + + return new InputStream[] {script}; + } + } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql index 6aafa7ba81e2..419856ce6ece 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql +++ b/engine/schema/src/main/resources/META-INF/db/schema-42200to42210.sql @@ -25,3 +25,5 @@ CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_event','vm_id', 'b -- Add vm_id column to cloud_usage.usage_volume table CALL `cloud_usage`.`IDEMPOTENT_ADD_COLUMN`('cloud_usage.usage_volume','vm_id', 'bigint UNSIGNED NULL COMMENT "VM ID associated with the volume usage"'); + +DELETE FROM `cloud`.`configuration` WHERE name = 'ucs.sync.blade.interval';