You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2013/12/02 09:03:02 UTC
git commit: Refactoring default deployment policy so that its all
refered partitions exist in the partitions file.
Updated Branches:
refs/heads/master 4f5bfd503 -> efc3bab37
Refactoring default deployment policy so that its all refered partitions exist in the partitions file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/efc3bab3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/efc3bab3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/efc3bab3
Branch: refs/heads/master
Commit: efc3bab37d8946f1859386bfad7132a6570c7c8a
Parents: 4f5bfd5
Author: Udara Liyanage <ud...@wso2.com>
Authored: Mon Dec 2 13:31:28 2013 -0500
Committer: Udara Liyanage <ud...@wso2.com>
Committed: Mon Dec 2 13:31:28 2013 -0500
----------------------------------------------------------------------
.../main/deployment-policies/economy-deployment.xml | 16 ++++------------
.../distribution/src/main/partitions/partitions.xml | 8 ++++++++
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/efc3bab3/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
index ab9fb0e..4948b4b 100644
--- a/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
+++ b/products/autoscaler/modules/distribution/src/main/deployment-policies/economy-deployment.xml
@@ -2,32 +2,24 @@
<deploymentPolicy id ="economy-deployment">
<partitionGroup id="group1" >
<partitionAlgo>one-after-another</partitionAlgo>
- <partition id="partition1" >
+ <partition id="P1" >
<max>3</max>
<min>1</min>
</partition>
- <partition id="partition2" >
+ <partition id="P2" >
<max>5</max>
<min>1</min>
</partition>
- <partition id="partition3">
- <max>20</max>
- <min>1</min>
- </partition>
</partitionGroup>
<partitionGroup id="group2" >
<partitionAlgo>round-robin</partitionAlgo>
- <partition id="partition4" >
+ <partition id="P3" >
<max>3</max>
<min>1</min>
</partition>
- <partition id="partition5" >
+ <partition id="P4" >
<max>5</max>
<min>1</min>
</partition>
- <partition id="partition6">
- <max>20</max>
- <min>1</min>
- </partition>
</partitionGroup>
</deploymentPolicy>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/efc3bab3/products/autoscaler/modules/distribution/src/main/partitions/partitions.xml
----------------------------------------------------------------------
diff --git a/products/autoscaler/modules/distribution/src/main/partitions/partitions.xml b/products/autoscaler/modules/distribution/src/main/partitions/partitions.xml
index ca9ef02..49eb4d2 100644
--- a/products/autoscaler/modules/distribution/src/main/partitions/partitions.xml
+++ b/products/autoscaler/modules/distribution/src/main/partitions/partitions.xml
@@ -30,4 +30,12 @@
<id>P2</id>
<property name="provider" value="openstack"/>
</partition>
+ <partition id="P3">
+ <id>P2</id>
+ <property name="provider" value="ec2"/>
+ </partition>
+ <partition id="P3">
+ <id>P2</id>
+ <property name="provider" value="ec2"/>
+ </partition>
</partitions>