This is an automated email from the ASF dual-hosted git repository. sureshanaparti pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit a5b6bc3be620f2b2f14321fd69643cf1bdd7d16c Merge: 7b94ccc443f 30d306622a9 Author: Suresh Kumar Anaparti <[email protected]> AuthorDate: Fri Jan 30 21:15:58 2026 +0530 Merge branch '4.22' .../api/command/user/vm/DeployVMCmd.java | 2 +- .../api/command/user/vm/UpdateVMCmd.java | 5 +- .../cloudstack/storage/to/SnapshotObjectTO.java | 2 - .../upgrade/SystemVmTemplateRegistration.java | 4 +- .../storage/snapshot/SnapshotObject.java | 5 +- extensions/HyperV/hyperv.py | 24 +++ extensions/Proxmox/proxmox.sh | 168 +++++++++++++-------- .../ExternalPathPayloadProvisioner.java | 65 +++++++- .../ExternalPathPayloadProvisionerTest.java | 148 ++++++++++++++++++ .../kvm/resource/LibvirtComputingResource.java | 15 +- .../kvm/storage/KVMStorageProcessor.java | 81 +++++++--- .../hypervisor/external/provisioner/provisioner.sh | 11 ++ .../main/java/com/cloud/api/ApiResponseHelper.java | 7 +- systemvm/debian/etc/apache2/vhost.template | 8 +- systemvm/debian/opt/cloud/bin/configure.py | 20 ++- systemvm/debian/opt/cloud/bin/setup/common.sh | 3 - systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 23 +-- ui/src/components/view/SearchFilter.vue | 26 ++-- ui/src/views/AutogenView.vue | 66 ++++---- .../com/cloud/usage/parser/BackupUsageParser.java | 3 +- .../usage/parser/VMSnapshotOnPrimaryParser.java | 2 +- .../cloudstack/utils/security/DigestHelper.java | 15 ++ 22 files changed, 519 insertions(+), 184 deletions(-) diff --cc engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java index 79a4bd6d6d8,d8cf070ae4c..292bafefbb6 --- a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java +++ b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java @@@ -1073,13 -999,16 +1073,13 @@@ public class SystemVmTemplateRegistrati } Hypervisor.HypervisorType hypervisorType = templateDetails.getHypervisorType(); updateSystemVMEntries(templateId, hypervisorType); - // Change value of global configuration parameter router.template.* for the corresponding hypervisor and minreq.sysvmtemplate.version for the ACS version - Map<String, String> configParams = new HashMap<>(); - configParams.put(RouterTemplateConfigurationNames.get(hypervisorType), templateDetails.getName()); - configParams.put("minreq.sysvmtemplate.version", getSystemVmTemplateVersion()); - updateConfigurationParams(configParams); + updateConfigurationParams(hypervisorType, templateDetails.getName(), zoneId); } - private void updateTemplateUrlChecksumAndGuestOsId(VMTemplateVO templateVO, MetadataTemplateDetails templateDetails) { + protected void updateTemplateUrlChecksumAndGuestOsId(VMTemplateVO templateVO, + MetadataTemplateDetails templateDetails) { templateVO.setUrl(templateDetails.getUrl()); - templateVO.setChecksum(templateDetails.getChecksum()); + templateVO.setChecksum(DigestHelper.prependAlgorithm(templateDetails.getChecksum())); GuestOSVO guestOS = guestOSDao.findOneByDisplayName(templateDetails.getGuestOs()); if (guestOS != null) { templateVO.setGuestOSId(guestOS.getId());
