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/03/08 03:03:19 UTC
stratos git commit: Cleaning the dependent-scaling/sample-cartridges
sample
Repository: stratos
Updated Branches:
refs/heads/master 6c3f1b8bd -> 72529738c
Cleaning the dependent-scaling/sample-cartridges sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/72529738
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/72529738
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/72529738
Branch: refs/heads/master
Commit: 72529738cb3b338ca857eac5a008c38841e33990
Parents: 6c3f1b8
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Mar 8 07:33:08 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Mar 8 07:33:08 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 8 --------
.../artifacts/autoscaling-policy.json | 14 --------------
.../artifacts/deployment-policy.json | 15 ---------------
.../artifacts/network-partition.json | 15 ---------------
.../sample-cartridges/scripts/common/deploy.sh | 2 --
5 files changed, 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/72529738/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
deleted file mode 100644
index 9d2c6a1..0000000
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
- "networkPartition":[
- {
- "id":"network-partition-1",
- "activeByDefault":"true"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/72529738/samples/applications/dependent-scaling/sample-cartridges/artifacts/autoscaling-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/artifacts/autoscaling-policy.json b/samples/applications/dependent-scaling/sample-cartridges/artifacts/autoscaling-policy.json
deleted file mode 100755
index 53a2b5f..0000000
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/autoscaling-policy.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
- "id": "autoscaling-policy-1",
- "loadThresholds": {
- "requestsInFlight": {
- "threshold": 40
- },
- "memoryConsumption": {
- "threshold": 40
- },
- "loadAverage": {
- "threshold": 40
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/72529738/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
deleted file mode 100644
index 666c299..0000000
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/deployment-policy.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "id": "deployment-policy-1",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/72529738/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
deleted file mode 100644
index 2a5b7ec..0000000
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "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/72529738/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh b/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
index 3bc1ea3..30a64b0 100755
--- a/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
+++ b/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
@@ -8,9 +8,7 @@ prgdir=`dirname "$0"`
script_path=`cd "$prgdir"; pwd`
artifacts_path=`cd "${script_path}/../../artifacts"; pwd`
-iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd`
cartridges_path=`cd "${script_path}/../../../../../cartridges/${iaas}"; pwd`
-cartridges_groups_path=`cd "${script_path}/../../../../../cartridges-groups"; pwd`
autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policies"; pwd`
network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd`
deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd`