Merge pull request #4790 from yrudman/allow-remote-retiement-for-service

Allow Service retirement over Centralized Administration
ManageIQ · Oct 24, 2018 · c15b650 · c15b650
2 parents ff14ca6 + f80cb98
commit c15b650
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/app/controllers/application_controller/ci_processing.rb b/app/controllers/application_controller/ci_processing.rb
@@ -280,11 +280,13 @@ def process_objects(objs, task, display_name = nil)
 
     display_name ||= task.titleize
     case klass_str
-    when 'OrchestrationStack', 'Service', 'CloudObjectStoreContainer', 'CloudObjectStoreObject'
-      objs, _objs_out_reg = filter_ids_in_region(objs, klass.to_s)
+    when 'CloudObjectStoreContainer', 'CloudObjectStoreObject'
+      objs, _objs_out_reg = filter_ids_in_region(objs, klass_str)
     when 'VmOrTemplate'
       objs, _objs_out_reg = filter_ids_in_region(objs, "VM") unless VmOrTemplate::REMOTE_REGION_TASKS.include?(task)
       klass = Vm
+    when 'OrchestrationStack', 'Service'
+      objs, _objs_out_reg = filter_ids_in_region(objs, klass_str) unless task == "retire_now"
     end
     return if objs.empty?