Fixes #30526 - provisioning templates will be taken from CR in HG too

hsahmed · Aug 2, 2020 · 2058a4f · 2058a4f
1 parent c39835f
commit 2058a4f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/app/models/concerns/hostext/operating_system.rb b/app/models/concerns/hostext/operating_system.rb
@@ -34,7 +34,8 @@ def available_template_kinds(provisioning = nil)
 
     def template_kinds(provisioning = nil)
       return TemplateKind.all unless provisioning == 'image'
-      cr     = ComputeResource.find_by_id(compute_resource_id)
+      cr_id  = compute_resource_id || hostgroup&.compute_resource_id
+      cr     = ComputeResource.find_by_id(cr_id)
       images = cr.try(:images)
       if images.blank?
         [TemplateKind.friendly.find('finish')]