Repository: stratos Updated Branches: refs/heads/master 4c8ba95d1 -> ac02c043c
Fixing the samples Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b0933e18 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b0933e18 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b0933e18 Branch: refs/heads/master Commit: b0933e18f13af4309b62a45fb0706cc20ba3dc27 Parents: 10b52cc Author: Vishanth <[email protected]> Authored: Mon May 11 20:48:24 2015 +0530 Committer: Vishanth <[email protected]> Committed: Mon May 11 20:48:24 2015 +0530 ---------------------------------------------------------------------- .../tomcat-single-signon/scripts/common/undeploy.sh | 5 +---- .../sample-cartridges/scripts/common/undeploy.sh | 9 +++++++++ .../sample-groups/scripts/common/undeploy.sh | 10 ++++++++++ .../group-scaling-app/scripts/common/deploy.sh | 12 ++++++------ .../group-scaling-app/scripts/common/undeploy.sh | 6 ++++++ .../group-scaling-v1/scripts/common/deploy.sh | 12 ++++++------ .../group-scaling-v1/scripts/common/undeploy.sh | 6 ++++++ .../scripts/common/undeploy.sh | 8 ++++++++ 8 files changed, 52 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh old mode 100644 new mode 100755 index 9e50142..135f9c4 --- a/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh +++ b/samples/applications/complex/tomcat-single-signon/scripts/common/undeploy.sh @@ -15,13 +15,10 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// echo "Removing cartridges..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/tomcat3 -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/wso2-is +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges/wso2is 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 application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-2 - - - http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh index 217fa69..2639156 100644 --- a/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh +++ b/samples/applications/scaling/dependent-scaling/sample-cartridges/scripts/common/undeploy.sh @@ -19,3 +19,12 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// 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 + +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 + +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh index a69d60d..755852e 100644 --- a/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh +++ b/samples/applications/scaling/dependent-scaling/sample-groups/scripts/common/undeploy.sh @@ -23,3 +23,13 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// 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 + +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 + +echo "Removing application policies..." +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/deploy.sh b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/deploy.sh index 9a10248..5114c50 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/deploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/deploy.sh @@ -9,12 +9,12 @@ script_path=`cd "$prgdir"; pwd` artifacts_path=`cd "${script_path}/../../artifacts"; pwd` iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd` -cartridges_path=`cd "${script_path}/../../../../../cartridges/${iaas}"; pwd` -cartridges_groups_path=`cd "${script_path}/../../../../../cartridges-groups"; pwd` -autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policies"; pwd` -network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd` -deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd` -application_policies_path=`cd "${script_path}/../../../../../application-policies"; pwd` +cartridges_path=`cd "${script_path}/../../../../../../cartridges/${iaas}"; pwd` +cartridges_groups_path=`cd "${script_path}/../../../../../../cartridges-groups"; pwd` +autoscaling_policies_path=`cd "${script_path}/../../../../../../autoscaling-policies"; pwd` +network_partitions_path=`cd "${script_path}/../../../../../../network-partitions/${iaas}"; pwd` +deployment_policies_path=`cd "${script_path}/../../../../../../deployment-policies"; pwd` +application_policies_path=`cd "${script_path}/../../../../../../application-policies"; pwd` set -e http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh index 599e6d7..7479137 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-app/scripts/common/undeploy.sh @@ -28,6 +28,12 @@ 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/autoscalingPolicies/autoscaling-policy-c3 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c4 +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 + +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 + echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/deploy.sh b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/deploy.sh index f6424b5..999b362 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/deploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/deploy.sh @@ -9,12 +9,12 @@ script_path=`cd "$prgdir"; pwd` artifacts_path=`cd "${script_path}/../../artifacts"; pwd` iaas_artifacts_path=`cd "${script_path}/../../artifacts/${iaas}"; pwd` -cartridges_path=`cd "${script_path}/../../../../../cartridges/${iaas}"; pwd` -cartridges_groups_path=`cd "${script_path}/../../../../../cartridges-groups"; pwd` -autoscaling_policies_path=`cd "${script_path}/../../../../../autoscaling-policies"; pwd` -network_partitions_path=`cd "${script_path}/../../../../../network-partitions/${iaas}"; pwd` -deployment_policies_path=`cd "${script_path}/../../../../../deployment-policies"; pwd` -application_policies_path=`cd "${script_path}/../../../../../application-policies"; pwd` +cartridges_path=`cd "${script_path}/../../../../../../cartridges/${iaas}"; pwd` +cartridges_groups_path=`cd "${script_path}/../../../../../../cartridges-groups"; pwd` +autoscaling_policies_path=`cd "${script_path}/../../../../../../autoscaling-policies"; pwd` +network_partitions_path=`cd "${script_path}/../../../../../../network-partitions/${iaas}"; pwd` +deployment_policies_path=`cd "${script_path}/../../../../../../deployment-policies"; pwd` +application_policies_path=`cd "${script_path}/../../../../../../application-policies"; pwd` set -e http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh index cbca5a0..9921107 100644 --- a/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/group-scaling-v1/scripts/common/undeploy.sh @@ -24,6 +24,12 @@ echo "Removing autoscaling policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c2 curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies/autoscaling-policy-c3 +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 + +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 + echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 http://git-wip-us.apache.org/repos/asf/stratos/blob/b0933e18/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh index 7060ee1..5c90f61 100644 --- a/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh +++ b/samples/applications/scaling/group-scaling/single-group-group-scaling/scripts/common/undeploy.sh @@ -22,7 +22,15 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// 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 + +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 + echo "Removing application policies..." curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applicationPolicies/application-policy-1 + +
