Updated Branches: refs/heads/master 9d7fb2f20 -> 43a6f85f8
Updated tenant range logic in cloud controller to only set the tenant range if service is multi-tenant Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6c2a8570 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6c2a8570 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6c2a8570 Branch: refs/heads/master Commit: 6c2a85706e5e5d177a4ca4685bf23aa9dbba39b7 Parents: 1aacd8b Author: Imesh Gunaratne <[email protected]> Authored: Mon Dec 23 13:35:43 2013 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Mon Dec 23 13:35:43 2013 +0530 ---------------------------------------------------------------------- .../stratos/cloud/controller/topology/TopologyBuilder.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6c2a8570/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java index d498f17..894975a 100644 --- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java +++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/topology/TopologyBuilder.java @@ -118,14 +118,18 @@ public class TopologyBuilder { // update the cluster cluster = service.getCluster(clusterId); cluster.addHostName(registrant.getHostName()); - cluster.setTenantRange(registrant.getTenantRange()); + if(service.getServiceType() == ServiceType.MultiTenant) { + cluster.setTenantRange(registrant.getTenantRange()); + } cluster.setProperties(props); cluster.setLbCluster(isLb); } else { cluster = new Cluster(cartridgeType, clusterId, registrant.getDeploymentPolicyName(), registrant.getAutoScalerPolicyName()); cluster.addHostName(registrant.getHostName()); - cluster.setTenantRange(registrant.getTenantRange()); + if(service.getServiceType() == ServiceType.MultiTenant) { + cluster.setTenantRange(registrant.getTenantRange()); + } cluster.setProperties(props); cluster.setLbCluster(isLb); service.addCluster(cluster);
