stratos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From im...@apache.org
Subject [1/2] stratos git commit: Changing term deploy to add in kubernetes workflow
Date Mon, 22 Dec 2014 05:27:30 GMT
Repository: stratos
Updated Branches:
  refs/heads/master fa072c5f6 -> 67e014219


Changing term deploy to add in kubernetes workflow


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5ea45b33
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5ea45b33
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5ea45b33

Branch: refs/heads/master
Commit: 5ea45b33d9b725fa369102067ad9855e6af067f9
Parents: fa072c5
Author: Imesh Gunaratne <imesh@apache.org>
Authored: Mon Dec 22 10:56:42 2014 +0530
Committer: Imesh Gunaratne <imesh@apache.org>
Committed: Mon Dec 22 10:56:42 2014 +0530

----------------------------------------------------------------------
 .../controller/services/impl/CloudControllerServiceImpl.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/5ea45b33/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index 8ec8595..e713cb7 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -1107,7 +1107,7 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
             lock = CloudControllerContext.getInstance().acquireKubernetesClusterWriteLock();
 
             if (log.isInfoEnabled()) {
-                log.info("Deploying new Kubernetes cluster: " + kubernetesCluster);
+                log.info("Adding kubernetes cluster: " + kubernetesCluster);
             }
             CloudControllerUtil.validateKubernetesCluster(kubernetesCluster);
 
@@ -1144,7 +1144,8 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
             lock = CloudControllerContext.getInstance().acquireKubernetesClusterWriteLock();
 
             if (log.isInfoEnabled()) {
-                log.info("Deploying new Kubernetes Host: " + kubernetesHost + " for Kubernetes
cluster id: " + kubernetesClusterId);
+                log.info(String.format("Adding kubernetes host for kubernetes cluster: [kubernetes-cluster-id]
%s " +
+                        "[hostname] %s", kubernetesClusterId, kubernetesHost.getHostname()));
             }
             CloudControllerUtil.validateKubernetesHost(kubernetesHost);
 
@@ -1155,7 +1156,8 @@ public class CloudControllerServiceImpl implements CloudControllerService
{
                 kubernetesHostArrayList = new ArrayList<KubernetesHost>();
             } else {
                 if (CloudControllerContext.getInstance().kubernetesHostExists(kubernetesHost.getHostId()))
{
-                    throw new InvalidKubernetesHostException("Kubernetes host already exists:
[id] " + kubernetesHost.getHostId());
+                    throw new InvalidKubernetesHostException("Kubernetes host already exists:
[hostnae] " +
+                            kubernetesHost.getHostId());
                 }
                 kubernetesHostArrayList = new
                         ArrayList<KubernetesHost>(Arrays.asList(kubernetesClusterStored.getKubernetesHosts()));


Mime
View raw message