From 24b77e3edf503e9eebd7e31696dd9dd04755e7e5 Mon Sep 17 00:00:00 2001
From: Gregg Tanzillo <gtanzill@redhat.com>
Date: Fri, 4 Jan 2019 09:50:34 -0500
Subject: [PATCH] Merge pull request #18330 from
 agrare/bz_1659340_fix_storage_disconnect_order

RHV requires disconnect_storage before ems

(cherry picked from commit be1857c218b1e4232ed0582d5b52dbe095943cc8)

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1659340
---
 app/models/vm_or_template.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/vm_or_template.rb b/app/models/vm_or_template.rb
index eb01154ca1b..849c302cd72 100644
--- a/app/models/vm_or_template.rb
+++ b/app/models/vm_or_template.rb
@@ -654,6 +654,7 @@ def self.repository_parse_path(path)
   #
 
   def disconnect_inv
+    disconnect_storage
     disconnect_ems
 
     classify_with_parent_folder_path(false)
@@ -663,7 +664,6 @@ def disconnect_inv
     end
 
     disconnect_host
-    disconnect_storage
     disconnect_stack if respond_to?(:orchestration_stack)
   end