Merge pull request #20773 from d-m-u/no_postprocess_without_job

don't call postprocess without job in playbook on_error (cherry picked from commit 19f3728)
ManageIQ · Nov 9, 2020 · 2e36bba · 2e36bba
1 parent 949a51e
commit 2e36bba
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/app/models/service_ansible_playbook.rb b/app/models/service_ansible_playbook.rb
@@ -89,8 +89,12 @@ def postprocess(action)
   def on_error(action)
     _log.info("on_error called for service action: #{action}")
     update(:retirement_state => 'error') if action == "Retirement"
-    job(action).try(:refresh_ems)
-    postprocess(action)
+    if job(action)
+      job(action).try(:refresh_ems)
+      postprocess(action)
+    else
+      _log.info("postprocess not called because job was nil")
+    end
   end
 
   def retain_resources_on_retirement?