Repository: stratos Updated Branches: refs/heads/master ea6c003d1 -> 2facde873
STRATOS-1147: Fixing kubernetes pod activation wait logic Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2facde87 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2facde87 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2facde87 Branch: refs/heads/master Commit: 2facde873272447a5e68843214c2b87d0b2f4740 Parents: ea6c003 Author: Imesh Gunaratne <[email protected]> Authored: Tue Jan 27 19:41:14 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Tue Jan 27 19:41:25 2015 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/2facde87/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java index 716842a..a0f74d9 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/iaases/kubernetes/KubernetesIaas.java @@ -365,7 +365,7 @@ public class KubernetesIaas extends Iaas { // Create replication controller String replicationControllerId = CloudControllerUtil.replaceDotsWithDash(memberContext.getMemberId()); - String replicationControllerName = CloudControllerUtil.replaceDotsWithDash(memberContext.getClusterId()); + String replicationControllerName = replicationControllerId; String dockerImage = iaasProvider.getImage(); EnvironmentVariable[] environmentVariables = KubernetesIaasUtil.prepareEnvironmentVariables( clusterContext, memberContext);
