You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/02/26 10:56:26 UTC
stratos git commit: Updating dependent scaling cartridges app with
deployment policy change
Repository: stratos
Updated Branches:
refs/heads/master-deployment-policy-fix-merge 20ed30e39 -> 106f46561
Updating dependent scaling cartridges app with deployment policy change
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/106f4656
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/106f4656
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/106f4656
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: 106f4656110cb7f7b50434dd06b328e5873ff8ef
Parents: 20ed30e
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Feb 26 15:26:15 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Feb 26 15:26:15 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 12 ++++++++++++
.../sample-cartridges/artifacts/application.json | 12 +++++++-----
.../artifacts/deployment-policy.json | 2 +-
.../artifacts/network-partition-2.json | 15 +++++++++++++++
.../artifacts/network-partition.json | 15 +++++++++++++++
.../sample-groups/artifacts/application.json | 1 +
6 files changed, 51 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
new file mode 100644
index 0000000..5aa91dd
--- /dev/null
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
@@ -0,0 +1,12 @@
+{
+ "networkPartition":[
+ {
+ "id":"network-partition-1",
+ "activeByDefault":"true"
+ },
+ {
+ "id":"network-partition-2",
+ "activeByDefault":"false"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-cartridges/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/application.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/application.json
index cc8ff35..052abc9 100644
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/application.json
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/application.json
@@ -1,6 +1,6 @@
{
- "applicationId": "sample-cartridges-app",
- "alias": "sample-cartridges-app",
+ "applicationId": "dependency-scaling-cartridges-app",
+ "alias": “my-dependency-scaling-cartridges-app”,
"components": {
"cartridges": [
{
@@ -8,8 +8,9 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "mytomcat",
+ "alias": "my-tomcat",
"autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy":"deployment-policy-1",
"artifactRepository":{
"privateRepo":false,
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git",
@@ -23,8 +24,9 @@
"cartridgeMin": 2,
"cartridgeMax": 4,
"subscribableInfo": {
- "alias": "myphp",
+ "alias": "my-php",
"autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy":"deployment-policy-1",
"artifactRepository":{
"privateRepo":false,
"repoUrl":"https://github.com/imesh/stratos-php-applications.git",
@@ -36,7 +38,7 @@
],
"dependencies": {
"scalingDependants": [
- "cartridge.tomcat, cartridge.php"
+ "cartridge.my-tomcat, cartridge.my-php"
],
"terminationBehaviour": "terminate-none"
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json
index d858aed..666c299 100644
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json
@@ -1,5 +1,5 @@
{
- "id": "deployment-policy-2",
+ "id": "deployment-policy-1",
"networkPartition": [
{
"id": "network-partition-1",
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition-2.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition-2.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition-2.json
new file mode 100644
index 0000000..0d07838
--- /dev/null
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition-2.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-2",
+ "partitions": [
+ {
+ "id": "partition-2",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition.json
new file mode 100644
index 0000000..2a5b7ec
--- /dev/null
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-1",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/106f4656/samples/applications/dependent-scaling/sample-groups/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-groups/artifacts/application.json b/samples/applications/dependent-scaling/sample-groups/artifacts/application.json
index a74c688..2b9cccb 100644
--- a/samples/applications/dependent-scaling/sample-groups/artifacts/application.json
+++ b/samples/applications/dependent-scaling/sample-groups/artifacts/application.json
@@ -8,6 +8,7 @@
"alias": "my-esb-php-group",
"groupMinInstances": 1,
"groupMaxInstances": 2,
+ "deploymentPolicy":"deployment-policy-1",
"cartridges": [
{
"type": "esb",