You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ud...@apache.org on 2015/05/12 16:39:23 UTC
[3/4] stratos git commit: Fixing the
php-tomcat-group-postres-mysql-group-esb samples
Fixing the php-tomcat-group-postres-mysql-group-esb samples
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aab520e5
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aab520e5
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aab520e5
Branch: refs/heads/master
Commit: aab520e5f3c59a59b06eb0b8faba5cb47b9751ed
Parents: 16402ac
Author: Vishanth <vi...@gmail.com>
Authored: Tue May 12 14:29:27 2015 +0530
Committer: Vishanth <vi...@gmail.com>
Committed: Tue May 12 14:29:27 2015 +0530
----------------------------------------------------------------------
.../artifacts/application.json | 6 +++++-
.../scripts/common/undeploy.sh | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/aab520e5/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
index c4ba93f..cefaf11 100644
--- a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
+++ b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/artifacts/application.json
@@ -119,7 +119,11 @@
{
"aliases": [
"group.my-dbgroup",
- "group.my-appgroup",
+ "group.my-appgroup"
+ ]
+ },
+ {
+ "aliases": [
"group.my-dbgroup",
"cartridge.my-esb"
]
http://git-wip-us.apache.org/repos/asf/stratos/blob/aab520e5/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
index 54613ed..a49573f 100644
--- a/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
+++ b/samples/applications/complex/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh
@@ -13,6 +13,10 @@ sleep 10
echo "Deleting application..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/my-compositeapp
+echo "Removing groups..."
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/app-group
+curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups/db-group
+
echo "Removing cartridges..."
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/php
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/postgres
@@ -20,7 +24,6 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat
curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/esb
-
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