You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/26 12:06:50 UTC
[1/3] stratos git commit: Adding default value to INTERNAL payload
parameter
Repository: stratos
Updated Branches:
refs/heads/master c453a8542 -> 669369670
Adding default value to INTERNAL payload parameter
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/170a84e3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/170a84e3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/170a84e3
Branch: refs/heads/master
Commit: 170a84e3661fcd384300dd5bb9ee1b605b767caa
Parents: c453a85
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 26 15:07:42 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 26 15:07:42 2014 +0530
----------------------------------------------------------------------
.../cloud/controller/services/impl/CloudControllerServiceImpl.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/170a84e3/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 4622e4d..be1b2c3 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
@@ -364,6 +364,7 @@ public class CloudControllerServiceImpl implements CloudControllerService {
addToPayload(payload, "LB_CLUSTER_ID", memberContext.getLbClusterId());
addToPayload(payload, "NETWORK_PARTITION_ID", memberContext.getNetworkPartitionId());
addToPayload(payload, "PARTITION_ID", partitionId);
+ addToPayload(payload, "INTERNAL", "false");
if (memberContext.getProperties() != null) {
org.apache.stratos.common.Properties properties = memberContext.getProperties();
[3/3] stratos git commit: Adding payload parameters to kubernetes
cluster context
Posted by im...@apache.org.
Adding payload parameters to kubernetes cluster context
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/66936967
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/66936967
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/66936967
Branch: refs/heads/master
Commit: 6693696703c39609542ecaf724ef3844d105988d
Parents: 12457b5
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 26 16:36:35 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 26 16:36:35 2014 +0530
----------------------------------------------------------------------
.../controller/iaases/kubernetes/KubernetesIaas.java | 15 +++++++++++++++
1 file changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/66936967/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 6084bdf..e438d50 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
@@ -33,6 +33,7 @@ import org.apache.stratos.cloud.controller.iaases.PartitionValidator;
import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceUtil;
import org.apache.stratos.cloud.controller.util.CloudControllerUtil;
import org.apache.stratos.cloud.controller.util.PodActivationWatcher;
+import org.apache.stratos.common.Property;
import org.apache.stratos.common.beans.NameValuePair;
import org.apache.stratos.common.constants.StratosConstants;
import org.apache.stratos.cloud.controller.domain.kubernetes.KubernetesCluster;
@@ -56,6 +57,7 @@ public class KubernetesIaas extends Iaas {
private static final long POD_CREATION_TIMEOUT = 120000; // 2 min
private static final String PAYLOAD_PARAMETER_SEPARATOR = ",";
private static final String PAYLOAD_PARAMETER_NAME_VALUE_SEPARATOR = "=";
+ private static final String PAYLOAD_PARAMETER_PREFIX = "payload_parameter.";
private PartitionValidator partitionValidator;
private List<NameValuePair> payload;
@@ -173,6 +175,19 @@ public class KubernetesIaas extends Iaas {
kubernetesCluster.getKubernetesMaster().getProperties(), StratosConstants.KUBERNETES_MASTER_PORT,
StratosConstants.KUBERNETES_MASTER_DEFAULT_PORT);
+ // Add kubernetes cluster payload parameters to payload
+ if((kubernetesCluster.getProperties() != null) &&
+ (kubernetesCluster.getProperties().getProperties() != null)) {
+ for(Property property : kubernetesCluster.getProperties().getProperties()) {
+ if(property != null) {
+ if(property.getName().startsWith(PAYLOAD_PARAMETER_PREFIX)) {
+ String name = property.getName().replace(PAYLOAD_PARAMETER_PREFIX, "");
+ payload.add(new NameValuePair(name, property.getValue()));
+ }
+ }
+ }
+ }
+
KubernetesClusterContext kubClusterContext = getKubernetesClusterContext(kubernetesClusterId,
kubernetesMasterIp, kubernetesMasterPort, kubernetesPortRange.getUpper(),
kubernetesPortRange.getLower());
[2/3] stratos git commit: Fixing INTERNAL parameter issue in python
agent
Posted by im...@apache.org.
Fixing INTERNAL parameter issue in python agent
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/12457b52
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/12457b52
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/12457b52
Branch: refs/heads/master
Commit: 12457b52db242f1b0cae75860867857efd4f9860
Parents: 170a84e
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Dec 26 16:35:44 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Dec 26 16:35:44 2014 +0530
----------------------------------------------------------------------
.../cartridgeagent/modules/config/cartridgeagentconfiguration.py | 4 ++--
.../cartridgeagent/modules/util/cartridgeagentconstants.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/12457b52/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
index 19ca458..21c3575 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/config/cartridgeagentconfiguration.py
@@ -165,8 +165,8 @@ class CartridgeAgentConfiguration:
cartridgeagentconstants.LISTEN_ADDRESS, False)
try:
- int_repo_str = self.read_property(cartridgeagentconstants.PROVIDER)
- self.is_internal_repo = True if str(int_repo_str).strip().lower() == cartridgeagentconstants.INTERNAL else False
+ int_repo_str = self.read_property(cartridgeagentconstants.INTERNAL)
+ self.is_internal_repo = True if str(int_repo_str).strip().lower() == "true" else False
except ParameterNotFoundException:
self.log.info(" INTERNAL payload parameter is not found")
self.is_internal_repo = False
http://git-wip-us.apache.org/repos/asf/stratos/blob/12457b52/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
index c4bd9c6..68ef5fb 100644
--- a/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
+++ b/components/org.apache.stratos.python.cartridge.agent/cartridgeagent/cartridgeagent/modules/util/cartridgeagentconstants.py
@@ -55,7 +55,7 @@ AUTO_COMMIT = "auto.commit"
AUTO_CHECKOUT = "auto.checkout"
LISTEN_ADDRESS = "listen.address"
PROVIDER = "PROVIDER"
-INTERNAL = "internal"
+INTERNAL = "INTERNAL"
LB_PRIVATE_IP = "lb.private.ip"
LB_PUBLIC_IP = "lb.public.ip"