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/27 17:38:19 UTC

stratos git commit: update sample-cartridges sample to use only one NW partition

Repository: stratos
Updated Branches:
  refs/heads/master 5587040c1 -> 22fdf78be


update sample-cartridges sample to use only one NW partition


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/22fdf78b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/22fdf78b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/22fdf78b

Branch: refs/heads/master
Commit: 22fdf78be8a62312a65b23e017f0de20cfad82b2
Parents: 5587040
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Fri Feb 27 22:08:08 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Fri Feb 27 22:08:08 2015 +0530

----------------------------------------------------------------------
 .../artifacts/application-policy.json                |  4 ----
 .../artifacts/network-partition-2.json               | 15 ---------------
 .../sample-cartridges/scripts/common/deploy.sh       |  3 +--
 3 files changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/22fdf78b/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
index 5aa91dd..9d2c6a1 100644
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
+++ b/samples/applications/dependent-scaling/sample-cartridges/artifacts/application-policy.json
@@ -3,10 +3,6 @@
       {
          "id":"network-partition-1",
          "activeByDefault":"true"
-      },
-      {
-         "id":"network-partition-2",
-         "activeByDefault":"false"
       }
    ]
 }

http://git-wip-us.apache.org/repos/asf/stratos/blob/22fdf78b/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
deleted file mode 100644
index 0d07838..0000000
--- a/samples/applications/dependent-scaling/sample-cartridges/artifacts/network-partition-2.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "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/22fdf78b/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 5eb92c2..196b4ca 100755
--- a/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
+++ b/samples/applications/dependent-scaling/sample-cartridges/scripts/common/deploy.sh
@@ -25,7 +25,6 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscal
 
 echo "Adding network partitions..."
 curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/network-partition.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions
-curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/network-partition-2.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions
 
 echo "Adding deployment policy..."
 curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies
@@ -44,4 +43,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
 sleep 1
 
 echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/dependency-scaling-cartridges-app/deploy
\ No newline at end of file
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/dependency-scaling-cartridges-app/deploy