Fix rescue during PXE and ISO provisioning

This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1446409
ManageIQ · May 1, 2017 · f57fa3b · f57fa3b
1 parent 768244a
commit f57fa3b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/app/models/manageiq/providers/redhat/infra_manager/ovirt_services.rb b/app/models/manageiq/providers/redhat/infra_manager/ovirt_services.rb
@@ -1,3 +1,4 @@
 module ManageIQ::Providers::Redhat::InfraManager::OvirtServices
-  require_nested :OvirtServices
+  class Error < StandardError; end
+  class VmNotReadyToBoot < Error; end
 end
diff --git a/app/models/manageiq/providers/redhat/infra_manager/ovirt_services/ovirt_services.rb b/app/models/manageiq/providers/redhat/infra_manager/ovirt_services/ovirt_services.rb
diff --git a/app/models/manageiq/providers/redhat/infra_manager/provision/state_machine.rb b/app/models/manageiq/providers/redhat/infra_manager/provision/state_machine.rb
@@ -83,6 +83,6 @@ def powered_off_in_provider?
   end
 
   def powered_on_in_provider?
-    destination.ext_management_system.ovirt_service.powered_on_in_provider?(destination)
+    destination.ext_management_system.ovirt_services.powered_on_in_provider?(destination)
   end
 end
diff --git a/app/models/manageiq/providers/redhat/infra_manager/provision_via_iso/state_machine.rb b/app/models/manageiq/providers/redhat/infra_manager/provision_via_iso/state_machine.rb
@@ -16,7 +16,7 @@ def boot_from_cdrom
 
     begin
       ext_management_system.ovirt_services.vm_boot_from_cdrom(self, iso_image.name)
-    rescue OvirtServices::VmNotReadyToBoot
+    rescue ManageIQ::Providers::Redhat::InfraManager::OvirtServices::VmNotReadyToBoot
       _log.info("#{destination_type} [#{dest_name}] is not yet ready to boot, will retry")
       requeue_phase
     else

diff --git a/app/models/manageiq/providers/redhat/infra_manager/provision_via_pxe/state_machine.rb b/app/models/manageiq/providers/redhat/infra_manager/provision_via_pxe/state_machine.rb
@@ -23,7 +23,7 @@ def boot_from_network
 
     begin
       ext_management_system.ovirt_services.vm_boot_from_network(self)
-    rescue OvirtServices::VmNotReadyToBoot
+    rescue ManageIQ::Providers::Redhat::InfraManager::OvirtServices::VmNotReadyToBoot
       _log.info("#{destination_type} [#{dest_name}] is not yet ready to boot, will retry")
       requeue_phase
     else