Allow endpoint selection logic for system templates in region and zone scopes

Daman Arora · Daman Arora · commit 387f958df138 · 2026-01-14T14:12:00.000-05:00
diff --git a/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java b/engine/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
@@ -400,7 +400,9 @@ public EndPoint select(DataObject object) {
         }
         if (object instanceof TemplateInfo) {
             TemplateInfo tmplInfo = (TemplateInfo)object;
-            if (store.getScope().getScopeType() == ScopeType.ZONE && store.getScope().getScopeId() == null && tmplInfo.getTemplateType() == TemplateType.SYSTEM) {
+            if (tmplInfo.getTemplateType() == TemplateType.SYSTEM &&
+                (store.getScope().getScopeType() == ScopeType.REGION ||
+                 (store.getScope().getScopeType() == ScopeType.ZONE && store.getScope().getScopeId() == null))) {
                 return LocalHostEndpoint.getEndpoint(); // for bootstrap system vm template downloading to region image store
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,9 @@ public EndPoint select(DataObject object) {`
`400`	`400`	`}`
`401`	`401`	`if (object instanceof TemplateInfo) {`
`402`	`402`	`TemplateInfo tmplInfo = (TemplateInfo)object;`
`403`		`- if (store.getScope().getScopeType() == ScopeType.ZONE && store.getScope().getScopeId() == null && tmplInfo.getTemplateType() == TemplateType.SYSTEM) {`
	`403`	`+ if (tmplInfo.getTemplateType() == TemplateType.SYSTEM &&`
	`404`	`+ (store.getScope().getScopeType() == ScopeType.REGION \|\|`
	`405`	`+ (store.getScope().getScopeType() == ScopeType.ZONE && store.getScope().getScopeId() == null))) {`
`404`	`406`	`return LocalHostEndpoint.getEndpoint(); // for bootstrap system vm template downloading to region image store`
`405`	`407`	`}`
`406`	`408`	`}`