This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.14 by this push:
new 95c4ef1 cks: fix for null hypervisor type (#4260)
95c4ef1 is described below
commit 95c4ef167d4d8ff4d44726636627086180a9712f
Author: Abhishek Kumar <[email protected]>
AuthorDate: Thu Aug 13 15:33:58 2020 +0530
cks: fix for null hypervisor type (#4260)
Fixes #4241
Failure to deploy VM when vm.instancename.flag is set to true
Signed-off-by: Abhishek Kumar <[email protected]>
---
.../actionworkers/KubernetesClusterResourceModifierActionWorker.java | 2 +-
.../cluster/actionworkers/KubernetesClusterStartWorker.java | 4 ++--
server/src/main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
index aeed9b8..8b6df14 100644
---
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
+++
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterResourceModifierActionWorker.java
@@ -334,7 +334,7 @@ public class KubernetesClusterResourceModifierActionWorker
extends KubernetesClu
String base64UserData =
Base64.encodeBase64String(k8sNodeConfig.getBytes(StringUtils.getPreferredCharset()));
nodeVm = userVmService.createAdvancedVirtualMachine(zone,
serviceOffering, clusterTemplate, networkIds, owner,
hostName, hostName, null, null, null,
- null, BaseCmd.HTTPMethod.POST, base64UserData,
kubernetesCluster.getKeyPair(),
+ Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,
base64UserData, kubernetesCluster.getKeyPair(),
null, addrs, null, null, null, customParameterMap, null, null,
null, null);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Created node VM ID: %s, %s in the
Kubernetes cluster ID: %s", nodeVm.getUuid(), hostName,
kubernetesCluster.getUuid()));
diff --git
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
index 24690c5..1ef5d0c 100644
---
a/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
+++
b/plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/actionworkers/KubernetesClusterStartWorker.java
@@ -200,7 +200,7 @@ public class KubernetesClusterStartWorker extends
KubernetesClusterResourceModif
String base64UserData =
Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
masterVm = userVmService.createAdvancedVirtualMachine(zone,
serviceOffering, clusterTemplate, networkIds, owner,
hostName, hostName, null, null, null,
- null, BaseCmd.HTTPMethod.POST, base64UserData,
kubernetesCluster.getKeyPair(),
+ Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,
base64UserData, kubernetesCluster.getKeyPair(),
requestedIps, addrs, null, null, null, customParameterMap,
null, null, null, null);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Created master VM ID: %s, %s in the
Kubernetes cluster ID: %s", masterVm.getUuid(), hostName,
kubernetesCluster.getUuid()));
@@ -254,7 +254,7 @@ public class KubernetesClusterStartWorker extends
KubernetesClusterResourceModif
String base64UserData =
Base64.encodeBase64String(k8sMasterConfig.getBytes(StringUtils.getPreferredCharset()));
additionalMasterVm = userVmService.createAdvancedVirtualMachine(zone,
serviceOffering, clusterTemplate, networkIds, owner,
hostName, hostName, null, null, null,
- null, BaseCmd.HTTPMethod.POST, base64UserData,
kubernetesCluster.getKeyPair(),
+ Hypervisor.HypervisorType.None, BaseCmd.HTTPMethod.POST,
base64UserData, kubernetesCluster.getKeyPair(),
null, addrs, null, null, null, customParameterMap, null, null,
null, null);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(String.format("Created master VM ID: %s, %s in the
Kubernetes cluster ID: %s", additionalMasterVm.getUuid(), hostName,
kubernetesCluster.getUuid()));
diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
index 158ef6a..34090a6 100644
--- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java
@@ -3700,7 +3700,7 @@ public class UserVmManagerImpl extends ManagerBase
implements UserVmManager, Vir
String instanceName = null;
String uuidName = _uuidMgr.generateUuid(UserVm.class, customId);
- if (_instanceNameFlag && hypervisor.equals(HypervisorType.VMware)) {
+ if (_instanceNameFlag && HypervisorType.VMware.equals(hypervisorType))
{
if (hostName == null) {
if (displayName != null) {
hostName = displayName;
