Merge remote-tracking branch 'origin/4.15'

Author: yadvr

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -3536,7 +3536,8 @@ private void orchestrateReboot(final String vmUuid, final Map<VirtualMachineProf
 
             final Answer rebootAnswer = cmds.getAnswer(RebootAnswer.class);
             if (rebootAnswer != null && rebootAnswer.getResult()) {
-                if (dc.isSecurityGroupEnabled() && vm.getType() == VirtualMachine.Type.User) {
+                boolean isVmSecurityGroupEnabled = _securityGroupManager.isVmSecurityGroupEnabled(vm.getId());
+                if (isVmSecurityGroupEnabled && vm.getType() == VirtualMachine.Type.User) {
                     List<Long> affectedVms = new ArrayList<Long>();
                     affectedVms.add(vm.getId());
                     _securityGroupManager.scheduleRulesetUpdateToHosts(affectedVms, true, null);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -4089,7 +4089,8 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
                         vm.setDetail(VmDetailConstants.FIRMWARE, "efi");
                         s_logger.info("guestOS is OSX : overwrite root disk controller to scsi, use smc and efi");
                     } else {
-                        String controllerSetting = _configDao.getValue("vmware.root.disk.controller");
+                        String controllerSetting = StringUtils.defaultIfEmpty(_configDao.getValue(Config.VmwareRootDiskControllerType.key()),
+                                Config.VmwareRootDiskControllerType.getDefaultValue());
                         // Don't override if VM already has root/data disk controller detail
                         if (vm.getDetail(VmDetailConstants.ROOT_DISK_CONTROLLER) == null) {
                             vm.setDetail(VmDetailConstants.ROOT_DISK_CONTROLLER, controllerSetting);

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java

@@ -2279,7 +2279,7 @@ public static String getMinimumHostHardwareVersion(VmwareHypervisorHost host1, V
             Integer host1Version = getHostHardwareVersion(host1);
             Integer host2Version = getHostHardwareVersion(host2);
             if (host1Version != null && host2Version != null && !host1Version.equals(host2Version)) {
-                hardwareVersion = String.valueOf(Math.min(host1Version, host2Version));
+                hardwareVersion = VirtualMachineMO.getVmxFormattedVirtualHardwareVersion(Math.min(host1Version, host2Version));
             }
         }
         return hardwareVersion;