remove fog server identity override; accept vm references in find_vm_…

…by_uuid
theforeman · Jul 2, 2019 · 5ed9618 · 5ed9618
1 parent d70d4bf
commit 5ed9618
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/app/models/concerns/fog_extensions/xenserver/server.rb b/app/models/concerns/fog_extensions/xenserver/server.rb
@@ -13,10 +13,6 @@ def id
         uuid
       end
 
-      def identity
-        uuid
-      end
-
       def to_s
         name
       end

diff --git a/app/models/foreman_xen/xenserver.rb b/app/models/foreman_xen/xenserver.rb
@@ -56,6 +56,8 @@ def cleanup_configdrive(uuid)
     # Fog::XenServer::Compute (client) isn't an ActiveRecord model which
     # supports find_by()
     def find_vm_by_uuid(uuid)
+      return client.servers.find { |s| s.reference == uuid } if uuid.start_with? 'OpaqueRef:'
+
       client.servers.find_by_uuid(uuid)
     rescue Fog::XenServer::RequestFailed => e
       Foreman::Logging.exception("Failed retrieving xenserver vm by uuid #{uuid}", e)