You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by re...@apache.org on 2015/03/01 19:36:01 UTC
[40/50] [abbrv] stratos git commit: updating single-cartridge app
sample
updating single-cartridge app sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bc2e7165
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bc2e7165
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bc2e7165
Branch: refs/heads/docker-grouping-merge
Commit: bc2e71653c5ab0349efb675161214b878ba207d2
Parents: 5b2571b
Author: R-Rajkumar <rr...@gmail.com>
Authored: Sun Mar 1 18:43:15 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Sun Mar 1 18:43:15 2015 +0530
----------------------------------------------------------------------
.../single-cartridge/artifacts/application-policy.json | 4 ----
samples/applications/single-cartridge/artifacts/application.json | 2 +-
samples/applications/single-cartridge/scripts/common/deploy.sh | 2 +-
samples/applications/single-cartridge/scripts/common/undeploy.sh | 2 +-
samples/deployment-policies/deployment-policy-1.json | 2 +-
5 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc2e7165/samples/applications/single-cartridge/artifacts/application-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/application-policy.json b/samples/applications/single-cartridge/artifacts/application-policy.json
index 5aa91dd..9d2c6a1 100644
--- a/samples/applications/single-cartridge/artifacts/application-policy.json
+++ b/samples/applications/single-cartridge/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/bc2e7165/samples/applications/single-cartridge/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/artifacts/application.json b/samples/applications/single-cartridge/artifacts/application.json
index 273823e..5babe77 100644
--- a/samples/applications/single-cartridge/artifacts/application.json
+++ b/samples/applications/single-cartridge/artifacts/application.json
@@ -11,7 +11,7 @@
"subscribableInfo":{
"alias":"my-php",
"autoscalingPolicy":"autoscaling-policy-1",
- "deploymentPolicy":"deployment-policy-4",
+ "deploymentPolicy":"deployment-policy-1",
"artifactRepository":{
"privateRepo":false,
"repoUrl":"https://github.com/imesh/stratos-php-applications.git",
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc2e7165/samples/applications/single-cartridge/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/deploy.sh b/samples/applications/single-cartridge/scripts/common/deploy.sh
index 74fd82c..ee56281 100755
--- a/samples/applications/single-cartridge/scripts/common/deploy.sh
+++ b/samples/applications/single-cartridge/scripts/common/deploy.sh
@@ -30,7 +30,7 @@ curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}
curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_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 "@${deployment_policies_path}/deployment-policy-4.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies
+curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies
echo "Adding php cartridge..."
curl -X POST -H "Content-Type: application/json" -d "@${iaas_cartridges_path}/php.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc2e7165/samples/applications/single-cartridge/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/single-cartridge/scripts/common/undeploy.sh b/samples/applications/single-cartridge/scripts/common/undeploy.sh
index b5781df..65499db 100644
--- a/samples/applications/single-cartridge/scripts/common/undeploy.sh
+++ b/samples/applications/single-cartridge/scripts/common/undeploy.sh
@@ -20,7 +20,7 @@ echo "Removing autoscale policies..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-1
echo "Removing deployment policies..."
-curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-4
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-1
echo "Removing network partitions..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/networkPartitions/network-partition-1
http://git-wip-us.apache.org/repos/asf/stratos/blob/bc2e7165/samples/deployment-policies/deployment-policy-1.json
----------------------------------------------------------------------
diff --git a/samples/deployment-policies/deployment-policy-1.json b/samples/deployment-policies/deployment-policy-1.json
index 666c299..108d529 100644
--- a/samples/deployment-policies/deployment-policy-1.json
+++ b/samples/deployment-policies/deployment-policy-1.json
@@ -7,7 +7,7 @@
"partitions": [
{
"id": "partition-1",
- "max": 5
+ "max": 20
}
]
}