boot order 기본값 1. hd, 2. cdrom 순으로 변경

Author: jschoiRR

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

@@ -3196,8 +3196,8 @@ protected GuestDef createGuestFromSpec(VirtualMachineTO vmTO, LibvirtVMDef vm, S
             }
         }
         guest.setUuid(uuid);
-        guest.setBootOrder(GuestDef.BootOrder.CDROM);
         guest.setBootOrder(GuestDef.BootOrder.HARDISK);
+        guest.setBootOrder(GuestDef.BootOrder.CDROM);
         return guest;
     }
 
@@ -3823,15 +3823,14 @@ public void detachAndAttachConfigDriveISO(final Connect conn, final String vmNam
 
     public synchronized String attachOrDetachConfigDriveISO(final Connect conn, final String vmName, VirtualMachineTO to, String cdPath, final boolean isAttach, final Integer diskSeq) throws LibvirtException, URISyntaxException,
             InternalErrorException {
-        String isoPath = "";
         DiskTO configDriveDisk = null;
         for (DiskTO disk : to.getDisks()) {
             if (disk.getPath() != null && disk.getPath().contains("configdrive")) {
                 configDriveDisk = disk;
                 break;
             }
         }
-        isoPath = getVolumePath(conn, configDriveDisk, to.isConfigDriveOnHostCache());
+        String isoPath = getVolumePath(conn, configDriveDisk, to.isConfigDriveOnHostCache());
         DiskDef iso = new DiskDef();
         if (isAttach && StringUtils.isNotBlank(isoPath) && configDriveDisk !=null && isoPath.lastIndexOf("/") > 0) {
             if (isoPath.startsWith(getConfigPath() + "/" + ConfigDrive.CONFIGDRIVEDIR) && isoPath.contains(vmName)) {