Repository: stratos Updated Branches: refs/heads/master d7e0b4e7d -> 059b2da3e
Changing single cartridge sample to use php cartridge Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/059b2da3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/059b2da3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/059b2da3 Branch: refs/heads/master Commit: 059b2da3e3aaca8bf9d48f91389a418c9b8ab171 Parents: d7e0b4e Author: Imesh Gunaratne <[email protected]> Authored: Thu Jan 29 11:55:10 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Jan 29 11:55:10 2015 +0530 ---------------------------------------------------------------------- .../applications/single-cartridge/artifacts/application.json | 4 ++-- .../iaases/ec2/artifacts/dep_single_group.json | 2 +- .../iaases/kubernetes/artifacts/deployment-policy.json | 2 +- .../single-cartridge/iaases/kubernetes/deploy.sh | 8 ++++---- .../single-cartridge/iaases/kubernetes/undeploy.sh | 2 +- .../iaases/mock/artifacts/deployment-policy.json | 2 +- .../iaases/openstack/artifacts/dep_single_group.json | 2 +- .../applications/single-cartridge/iaases/openstack/deploy.sh | 2 +- samples/cartridges/kubernetes/php.json | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/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 9417a06..2226cff 100644 --- a/samples/applications/single-cartridge/artifacts/application.json +++ b/samples/applications/single-cartridge/artifacts/application.json @@ -5,11 +5,11 @@ "components":{ "cartridges":[ { - "type":"tomcat", + "type":"php", "cartridgeMin": 1, "cartridgeMax": 10, "subscribableInfo":{ - "alias":"tomcat1", + "alias":"php1", "autoscalingPolicy":"autoscale_policy_1", "artifactRepository":{ "privateRepo":false, http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json b/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json index eacc2eb..c53e805 100644 --- a/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json +++ b/samples/applications/single-cartridge/iaases/ec2/artifacts/dep_single_group.json @@ -22,7 +22,7 @@ }, "childPolicies": [ { - "alias": "mytomcat", + "alias": "php1", "networkPartition": [ { "id": "EC2-P1", http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json b/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json index f0671a1..9b316a0 100644 --- a/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json +++ b/samples/applications/single-cartridge/iaases/kubernetes/artifacts/deployment-policy.json @@ -22,7 +22,7 @@ }, "childPolicies":[ { - "alias":"tomcat1", + "alias":"php1", "networkPartition":[ { "id":"network-p1", http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh b/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh index 9440823..6385df1 100755 --- a/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh +++ b/samples/applications/single-cartridge/iaases/kubernetes/deploy.sh @@ -1,6 +1,6 @@ #!/bin/bash -export iaas="kubernetes" #[openstack, ec2, mock, kubernetes] +export iaas="kubernetes" #[openstack, ec2, mock, kubernetes] export host_ip="localhost" export artifacts_path="../../artifacts" @@ -18,9 +18,9 @@ sleep 1 # Adding cartridges pushd ${cartridges_path} - # Adding tomcat cartridge -echo "Adding tomcat cartridge..." -curl -X POST -H "Content-Type: application/json" -d @'tomcat.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges +# Adding php cartridge +echo "Adding php cartridge..." +curl -X POST -H "Content-Type: application/json" -d @'php.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges popd sleep 5 http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh b/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh index 56bb2b5..cb95f58 100644 --- a/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh +++ b/samples/applications/single-cartridge/iaases/kubernetes/undeploy.sh @@ -16,7 +16,7 @@ curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https:// # Removing cartridges echo "Removing cartridges..." -curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/tomcat +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:9443/api/cartridges/php # Removing kubernetes echo "Removing kubernetes cluster..." http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json b/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json index 9cca1f5..9cd5f41 100644 --- a/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json +++ b/samples/applications/single-cartridge/iaases/mock/artifacts/deployment-policy.json @@ -22,7 +22,7 @@ }, "childPolicies": [ { - "alias": "tomcat1", + "alias": "php1", "networkPartition": [ { "id": "network-p1", http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json b/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json index fe2ed5e..7f2bc6f 100644 --- a/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json +++ b/samples/applications/single-cartridge/iaases/openstack/artifacts/dep_single_group.json @@ -22,7 +22,7 @@ }, "childPolicies": [ { - "alias": "tomcat1", + "alias": "php1", "networkPartition": [ { "id": "OS-P1", http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/applications/single-cartridge/iaases/openstack/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/single-cartridge/iaases/openstack/deploy.sh b/samples/applications/single-cartridge/iaases/openstack/deploy.sh index 8e807e3..b82d3a6 100755 --- a/samples/applications/single-cartridge/iaases/openstack/deploy.sh +++ b/samples/applications/single-cartridge/iaases/openstack/deploy.sh @@ -18,7 +18,7 @@ sleep 1 # Adding cartridges pushd ${cartridges_path} - # Adding tomcat cartridge +# Adding tomcat cartridge echo "Adding tomcat cartridge..." curl -X POST -H "Content-Type: application/json" -d @'tomcat.json' -k -u admin:admin https://${host_ip}:9443/api/cartridges popd http://git-wip-us.apache.org/repos/asf/stratos/blob/059b2da3/samples/cartridges/kubernetes/php.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json index 52c0d72..2a4315a 100755 --- a/samples/cartridges/kubernetes/php.json +++ b/samples/cartridges/kubernetes/php.json @@ -20,7 +20,7 @@ "iaasProvider":[ { "type":"kubernetes", - "imageId":"stratos/cartridge:4.1.0-alpha", + "imageId":"stratos/php:4.1.0-alpha", "networkInterfaces":[ { "name":"network-non-routable",
