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/10 12:28:52 UTC
stratos git commit: Making dependency scaling sample consistant with
single cartridge sample
Repository: stratos
Updated Branches:
refs/heads/master 92ccefca7 -> 410ba42a8
Making dependency scaling sample consistant with single cartridge sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/410ba42a
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/410ba42a
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/410ba42a
Branch: refs/heads/master
Commit: 410ba42a842d1806db9b3e6f9a1818e7a873c589
Parents: 92ccefc
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Tue Mar 10 16:58:40 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Tue Mar 10 16:58:40 2015 +0530
----------------------------------------------------------------------
.../dependent-scaling/sample-groups/scripts/common/deploy.sh | 5 +----
samples/applications/single-cartridge/scripts/common/deploy.sh | 3 +--
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/410ba42a/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh b/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
index f9ccdce..884b33c 100755
--- a/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
+++ b/samples/applications/dependent-scaling/sample-groups/scripts/common/deploy.sh
@@ -49,13 +49,10 @@ echo "Adding application policy..."
curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies
sleep 1
-
-echo "Creating application..."
+echo "Adding application..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications
sleep 1
-
echo "Deploying application..."
-
curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/dependency-scaling-groups-app/deploy/application-policy-1
http://git-wip-us.apache.org/repos/asf/stratos/blob/410ba42a/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 c0e26fe..a32d462 100755
--- a/samples/applications/single-cartridge/scripts/common/deploy.sh
+++ b/samples/applications/single-cartridge/scripts/common/deploy.sh
@@ -37,14 +37,13 @@ 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
sleep 1
-
echo "Adding application policy..."
curl -X POST -H "Content-Type: application/json" -d "@${application_policies_path}/application-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies
+sleep 1
echo "Adding application..."
curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications
sleep 1
-
echo "Deploying application..."
curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/deploy/application-policy-1