fix SystemVM template URL update for S3 secondary storage

Author: Daman Arora

engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

@@ -960,7 +960,7 @@ public void registerTemplates(List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>>
                     public void doInTransactionWithoutResult(final TransactionStatus status) {
                         List<Long> zoneIds = getEligibleZoneIds();
                         if (zoneIds.isEmpty()) {
-                            updateTemplateUrlsForNonNfsStores(hypervisorsArchInUse);
+                            updateSystemVmTemplateUrlsForNonNfsStores();
                             return;
                         }
                         for (Long zoneId : zoneIds) {
@@ -988,8 +988,9 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
         }
     }
 
-    private void updateTemplateUrlsForNonNfsStores(List<Pair<Hypervisor.HypervisorType, CPU.CPUArch>> hypervisorsInUse) {
-        for (Pair<Hypervisor.HypervisorType, CPU.CPUArch> hypervisorArch : hypervisorsInUse) {
+    public void updateSystemVmTemplateUrlsForNonNfsStores() {
+        for (Pair<Hypervisor.HypervisorType, CPU.CPUArch> hypervisorArch :
+                clusterDao.listDistinctHypervisorsArchAcrossClusters(null)) {
             MetadataTemplateDetails templateDetails = getMetadataTemplateDetails(hypervisorArch.first(), hypervisorArch.second());
             if (templateDetails == null) {
                 continue;

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

@@ -3585,6 +3585,7 @@ public ImageStore discoverImageStore(String name, String url, String providerNam
 
         if (((ImageStoreProvider)storeProvider).needDownloadSysTemplate()) {
             // trigger system vm template download
+            new SystemVmTemplateRegistration().updateSystemVmTemplateUrlsForNonNfsStores();
             _imageSrv.downloadBootstrapSysTemplate(store);
         } else {
             // populate template_store_ref table