updaing php-tomcat-group-postgres-mysql-group-esb sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/cf7c8a63 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/cf7c8a63 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/cf7c8a63 Branch: refs/heads/master Commit: cf7c8a63ec6d9e6638b8733cda556f66eac6ca84 Parents: 9a4251c Author: reka <[email protected]> Authored: Wed Apr 29 15:42:13 2015 +0530 Committer: reka <[email protected]> Committed: Wed Apr 29 16:14:03 2015 +0530 ---------------------------------------------------------------------- .../artifacts/application-signup.json | 18 ------------------ .../artifacts/domain-mappings.json | 9 --------- .../scripts/common/undeploy.sh | 10 ++++++++-- .../scripts/ec2/deploy.sh | 9 --------- .../scripts/ec2/undeploy.sh | 7 ------- .../scripts/kubernetes/deploy.sh | 16 ---------------- .../scripts/kubernetes/undeploy.sh | 13 ------------- .../scripts/openstack/deploy.sh | 9 --------- .../scripts/openstack/undeploy.sh | 7 ------- samples/cartridges-groups/db-group.json | 1 - 10 files changed, 8 insertions(+), 91 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/application-signup.json ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/application-signup.json b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/application-signup.json deleted file mode 100644 index 138648e..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/application-signup.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "artifactRepositories":[ - { - "alias":"php", - "privateRepo":false, - "repoUrl":"https://github.com/imesh/stratos-php-applications.git";, - "repoUsername":"", - "repoPassword":"" - }, - { - "alias":"tomcat", - "privateRepo":false, - "repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git";, - "repoUsername":"", - "repoPassword":"" - } - ] -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/domain-mappings.json ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/domain-mappings.json b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/domain-mappings.json deleted file mode 100644 index 78e6008..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/artifacts/domain-mappings.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "domainMappings": [ - { - "cartridgeAlias":"my-php", - "domainName":"abc.com", - "contextPath":"/abc/app" - } - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh index b0174b8..54613ed 100644 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh +++ b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/common/undeploy.sh @@ -6,21 +6,27 @@ host_port=9443 set -e echo "Undeploying application..." -curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/single-cartridge-app/undeploy +curl -X POST -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/my-compositeapp/undeploy 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/single-cartridge-app +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/my-compositeapp 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 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/mysql +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 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-1 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies/deployment-policy-2 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/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/deploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/deploy.sh deleted file mode 100755 index 1370667..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/deploy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -iaas="ec2" - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` - -bash ${common_folder}/deploy.sh ${iaas} http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/undeploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/undeploy.sh deleted file mode 100644 index 17d8c71..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/ec2/undeploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` - -bash ${common_folder}/undeploy.sh http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/deploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/deploy.sh deleted file mode 100755 index d6c47c1..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/deploy.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -host_ip="localhost" -host_port=9443 -iaas="kubernetes" - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` -kubernetes_clusters_path=`cd "${script_path}/../../../../kubernetes-clusters"; pwd` - - -echo "Adding kubernetes cluster..." -curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-1.json" -k -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters - -bash ${common_folder}/deploy.sh ${iaas} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/undeploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/undeploy.sh deleted file mode 100755 index 0054670..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/kubernetes/undeploy.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -host_ip="localhost" -host_port=9443 - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` - -bash ${common_folder}/undeploy.sh - -echo "Removing kubernetes cluster..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/deploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/deploy.sh deleted file mode 100755 index 4c39959..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/deploy.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -iaas="openstack" - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` - -bash ${common_folder}/deploy.sh ${iaas} http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/undeploy.sh b/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/undeploy.sh deleted file mode 100644 index 17d8c71..0000000 --- a/samples/applications/php-tomcat-group-postgres-mysql-group-esb/scripts/openstack/undeploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -prgdir=`dirname "$0"` -script_path=`cd "$prgdir"; pwd` -common_folder=`cd "${script_path}/../common"; pwd` - -bash ${common_folder}/undeploy.sh http://git-wip-us.apache.org/repos/asf/stratos/blob/cf7c8a63/samples/cartridges-groups/db-group.json ---------------------------------------------------------------------- diff --git a/samples/cartridges-groups/db-group.json b/samples/cartridges-groups/db-group.json index e07f40a..3808caf 100644 --- a/samples/cartridges-groups/db-group.json +++ b/samples/cartridges-groups/db-group.json @@ -6,7 +6,6 @@ ], "dependencies": { "terminationBehaviour": "terminate-all" - ] }, "groupScalingEnabled": true }
