Merge pull request ManageIQ#11606 from theseaofstars/dev2

fix bug in vm pxe provision from rhev

app/models/manageiq/providers/redhat/infra_manager/provision/state_machine.rb

@@ -40,10 +40,14 @@ def customize_destination
       _log.info("#{message} #{for_destination}")
       update_and_notify_parent(:message => message)
       configure_container
-      signal :poll_destination_powered_off_in_provider
+      signal :customize_guest
     end
   end
 
+  def customize_guest
+    signal :poll_destination_powered_off_in_provider
+  end
+
   def autostart_destination
     destination.custom_attributes.create!(:name => "miq_provision_boot_with_cloud_init") if phase_context[:boot_with_cloud_init]
 

app/models/manageiq/providers/redhat/infra_manager/provision_via_iso/state_machine.rb

@@ -4,6 +4,11 @@ def configure_destination
     signal :boot_from_cdrom
   end
 
+  def customize_guest
+    attach_floppy_payload
+    signal :boot_from_cdrom
+  end
+
   def boot_from_cdrom
     message = "Booting from CDROM"
     _log.info("#{message} #{for_destination}")

app/models/manageiq/providers/redhat/infra_manager/provision_via_pxe/state_machine.rb

@@ -3,6 +3,10 @@ def configure_destination
     signal :create_pxe_configuration_file
   end
 
+  def customize_guest
+    signal :create_pxe_configuration_file
+  end
+
   def create_pxe_configuration_file
     message = "Generating PXE and Customization Files on PXE Server"
     _log.info("#{message} #{for_destination}")

spec/models/manageiq/providers/redhat/infra_manager/provision/state_machine_spec.rb

@@ -35,6 +35,7 @@
       :poll_clone_complete                      => {:signals => 1, :calls => 3},
       :poll_destination_in_vmdb                 => {:signals => 1, :calls => 3},
       :customize_destination                    => {:signals => 1, :calls => 3},
+      :customize_guest                          => {:signals => 1, :calls => 1},
       :poll_destination_powered_off_in_provider => {:signals => 1, :calls => 4},
       :poll_destination_powered_off_in_vmdb     => {:signals => 2, :calls => 2},
       :post_provision                           => {:signals => 1, :calls => 1},
@@ -47,6 +48,10 @@
 
   include_examples "End-to-end State Machine Run"
 
+  def test_customize_guest
+    call_method
+  end
+
   def test_create_destination
     call_method
   end