Merge pull request #18200 from agrare/bz_1644770_disconnect_storage_w…

…hen_disconnecting_vms Disconnect storage when disconnecting the VM (cherry picked from commit 3e466eb) https://bugzilla.redhat.com/show_bug.cgi?id=1644770
ManageIQ · Nov 30, 2018 · 952c1fc · 952c1fc
1 parent 8dd25eb
commit 952c1fc
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/app/models/ems_event/automate.rb b/app/models/ems_event/automate.rb
@@ -95,10 +95,6 @@ def src_vm_destroy_all_snapshots
       call("src_vm", "snapshots.destroy_all")
     end
 
-    def src_vm_disconnect_storage
-      call("src_vm", "disconnect_storage")
-    end
-
     private
 
     def parse_policy_parameters(target_str, policy_event, param)

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
@@ -663,7 +663,7 @@ def disconnect_inv
     end
 
     disconnect_host
-
+    disconnect_storage
     disconnect_stack if respond_to?(:orchestration_stack)
   end