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/22 09:51:01 UTC
[1/2] stratos git commit: Fixing logic which set container image id
Repository: stratos
Updated Branches:
refs/heads/master 2bb77145d -> 7fa3c1701
Fixing logic which set container image id
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7fa3c170
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7fa3c170
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7fa3c170
Branch: refs/heads/master
Commit: 7fa3c17015ab303f213db403d7bde9ad53b4520c
Parents: e623786
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 22 14:20:41 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 14:20:55 2014 +0530
----------------------------------------------------------------------
...ContainerClusterContextToKubernetesContainer.java | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7fa3c170/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
index 4db6ea8..274ab75 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/functions/ContainerClusterContextToKubernetesContainer.java
@@ -59,7 +59,20 @@ public class ContainerClusterContextToKubernetesContainer implements Function<Me
throw new RuntimeException(message);
}
- container.setImage(cartridge.getContainer().getImageName());
+ Partition partition = memberContext.getPartition();
+ if(partition == null) {
+ String message = "Partition not found in member context: [member-id] " + memberContext.getMemberId();
+ log.error(message);
+ throw new RuntimeException(message);
+ }
+
+ IaasProvider iaasProvider = cartridge.getIaasProviderOfPartition(partition.getId());
+ if(iaasProvider == null) {
+ String message = "Could not find iaas provider: [partition-id] " + partition.getId();
+ log.error(message);
+ throw new RuntimeException(message);
+ }
+ container.setImage(iaasProvider.getImage());
container.setPorts(getPorts(cartridge));
container.setEnv(getEnvironmentVariables(memberContext, clusterContext));
return container;
[2/2] stratos git commit: Removing container section in cartridge
definition
Posted by im...@apache.org.
Removing container section in cartridge definition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e6237863
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e6237863
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e6237863
Branch: refs/heads/master
Commit: e6237863ca3aec3f9b51eeed2a2518a5fc11dc3d
Parents: 2bb7714
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Dec 22 13:34:38 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Dec 22 14:20:55 2014 +0530
----------------------------------------------------------------------
.../stratos/cloud/controller/domain/Cartridge.java | 12 +-----------
.../cloud/controller/domain/CartridgeConfig.java | 9 ---------
.../services/impl/CloudControllerServiceImpl.java | 15 ---------------
.../cloud/controller/util/CloudControllerUtil.java | 5 -----
4 files changed, 1 insertion(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6237863/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
index 6cce42b..592cfaf 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/Cartridge.java
@@ -87,9 +87,7 @@ public class Cartridge implements Serializable{
* Value - Corresponding IaasProvider.
*/
private Map<String, IaasProvider> partitionToIaasProvider;
-
- private Container container;
-
+
public Cartridge(){
init();
}
@@ -376,14 +374,6 @@ public class Cartridge implements Serializable{
this.serviceGroup = serviceGroup;
}
- public Container getContainer() {
- return container;
- }
-
- public void setContainer(Container container) {
- this.container = container;
- }
-
public String[] getExportingProperties() {
return exportingProperties;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6237863/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
index 3c49786..42f4acf 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/domain/CartridgeConfig.java
@@ -71,7 +71,6 @@ public class CartridgeConfig implements Serializable {
private String serviceGroup;
- private Container container;
private String[] exportingProperties;
private String deployerType;
@@ -299,14 +298,6 @@ public class CartridgeConfig implements Serializable {
this.exportingProperties = exportingProperties;
}
- public Container getContainer() {
- return container;
- }
-
- public void setContainer(Container container) {
- this.container = container;
- }
-
public String getDeployerType() {
return deployerType;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6237863/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 8608fc8..9500920 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
@@ -87,21 +87,6 @@ public class CloudControllerServiceImpl implements CloudControllerService {
throw new InvalidCartridgeDefinitionException(msg, e);
}
- List<IaasProvider> iaasProviders = cartridge.getIaases();
-
- // TODO: Fix kubernetes config
-// if (!StratosConstants.KUBERNETES_DEPLOYER_TYPE.equals(cartridge.getDeployerType())) {
-// if (iaasProviders == null || iaasProviders.isEmpty()) {
-// String msg = "Invalid cartridge definition, iaas providers not found: [cartridge-type] " + cartridgeConfig.getType();
-// log.error(msg);
-// throw new InvalidCartridgeDefinitionException(msg);
-// }
-//
-// for (IaasProvider iaasProvider : iaasProviders) {
-// CloudControllerServiceUtil.buildIaas(iaasProvider);
-// }
-// }
-
// TODO transaction begins
String cartridgeType = cartridge.getType();
// Undeploy if already deployed
http://git-wip-us.apache.org/repos/asf/stratos/blob/e6237863/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
index 0e28a68..d29d9d9 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/util/CloudControllerUtil.java
@@ -190,11 +190,6 @@ public class CloudControllerUtil {
}
}
}
-
- // populate container
- if(config.getContainer() != null) {
- cartridge.setContainer(config.getContainer());
- }
if(config.getExportingProperties() != null){
cartridge.setExportingProperties(config.getExportingProperties());