Merge branch 'ablestack-diplo' into hostDeviceFilter

Author: jschoiRR

core/src/main/java/com/cloud/agent/api/CleanupVMCommand.java

@@ -19,6 +19,7 @@
 
 package com.cloud.agent.api;
 
+<<<<<<<< HEAD:core/src/main/java/com/cloud/agent/api/CleanupVMCommand.java
 /**
  * This command will destroy a leftover VM during the expunge process if it wasn't destroyed before.
  *
@@ -33,14 +34,30 @@ public CleanupVMCommand(String vmName) {
     public CleanupVMCommand(String vmName, boolean executeInSequence) {
         this.vmName = vmName;
         this.executeInSequence = executeInSequence;
+========
+public class UpdateHaStateCommand extends Command {
+
+    String hostHAState;
+
+    public UpdateHaStateCommand(String hostHAState) {
+        this.hostHAState = hostHAState;
+    }
+
+    public String getHostHAState() {
+        return hostHAState;
+>>>>>>>> 23aff2e406 (Merge branch 'ablestack-diplo' into hostDeviceFilter):core/src/main/java/com/cloud/agent/api/UpdateHaStateCommand.java
     }
 
     @Override
     public boolean executeInSequence() {
+<<<<<<<< HEAD:core/src/main/java/com/cloud/agent/api/CleanupVMCommand.java
         return executeInSequence;
     }
 
     public String getVmName() {
         return vmName;
+========
+        return true;
+>>>>>>>> 23aff2e406 (Merge branch 'ablestack-diplo' into hostDeviceFilter):core/src/main/java/com/cloud/agent/api/UpdateHaStateCommand.java
     }
 }

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java

@@ -3383,6 +3383,7 @@ protected GuestDef createGuestFromSpec(VirtualMachineTO vmTO, LibvirtVMDef vm, S
         if(!isGuestS390x()) {
             guest.setBootOrder(GuestDef.BootOrder.CDROM);
         }
+        guest.setBootOrder(GuestDef.BootOrder.CDROM);
         return guest;
     }
 
@@ -6662,4 +6663,4 @@ public String getHypervisorPath() {
     public String getGuestCpuArch() {
         return guestCpuArch;
     }
-}
+}