This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit e2cfddb1b6a9f363ed48f97d62f3fd058326f20d
Merge: ab76d3c9ccb 35fe19f096d
Author: Daan Hoogland <d...@onecht.net>
AuthorDate: Mon Jan 13 11:23:14 2025 +0100
Merge branch '4.19' into 4.20
.../com/cloud/agent/api/CheckOnHostCommand.java | 3 +--
.../upgrade/SystemVmTemplateRegistration.java | 23 +++++++++++++++-------
.../java/com/cloud/storage/StorageManagerImpl.java | 2 +-
systemvm/patch-sysvms.sh | 3 +++
4 files changed, 21 insertions(+), 10 deletions(-)
diff --cc systemvm/patch-sysvms.sh
index e7195436722,dfe39fd8e00..f24136155f8
--- a/systemvm/patch-sysvms.sh
+++ b/systemvm/patch-sysvms.sh
@@@ -124,12 -122,11 +124,15 @@@ patch_systemvm()
echo "Restored keystore file and certs using backup" >> $logfile 2>&1
fi
+ # Import global cacerts into 'cloud' service's keystore
+ keytool -importkeystore -srckeystore /etc/ssl/certs/java/cacerts
-destkeystore /usr/local/cloud/systemvm/certs/realhostip.keystore -srcstorepass
changeit -deststorepass vmops.com -noprompt || true
+
update_checksum $newpath/cloud-scripts.tgz
+ if [ -f /opt/cloud/bin/setup/patch.sh ];then
+ . /opt/cloud/bin/setup/patch.sh && patch_system_vm
+ fi
+
if [ "$TYPE" == "consoleproxy" ] || [ "$TYPE" == "secstorage" ] || [[
"$TYPE" == *router ]]; then
restart_services
fi
