Repository: stratos Updated Branches: refs/heads/master 0ee04f913 -> 242b27db0
Fixing single-cartridge sample kubernetes parameters Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/242b27db Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/242b27db Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/242b27db Branch: refs/heads/master Commit: 242b27db00906461fb43817faa71d6959d4eb98a Parents: 0ee04f9 Author: Imesh Gunaratne <[email protected]> Authored: Thu May 21 01:17:41 2015 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu May 21 01:20:22 2015 +0530 ---------------------------------------------------------------------- .../simple/single-cartridge-app/scripts/kubernetes/deploy.sh | 2 +- .../simple/single-cartridge-app/scripts/kubernetes/undeploy.sh | 2 +- samples/cartridges/kubernetes/php.json | 4 ++-- samples/network-partitions/kubernetes/network-partition-2.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/242b27db/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh index 27c88c1..548c166 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/deploy.sh @@ -31,6 +31,6 @@ kubernetes_clusters_path=`cd "${script_path}/../../../../../kubernetes-clusters" 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 +curl -X POST -H "Content-Type: application/json" -d "@${kubernetes_clusters_path}/kubernetes-cluster-2.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/242b27db/samples/applications/simple/single-cartridge-app/scripts/kubernetes/undeploy.sh ---------------------------------------------------------------------- diff --git a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/undeploy.sh b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/undeploy.sh index 450e154..cd20096 100755 --- a/samples/applications/simple/single-cartridge-app/scripts/kubernetes/undeploy.sh +++ b/samples/applications/simple/single-cartridge-app/scripts/kubernetes/undeploy.sh @@ -30,4 +30,4 @@ 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 +curl -X DELETE -H "Content-Type: application/json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/kubernetesClusters/kubernetes-cluster-2 http://git-wip-us.apache.org/repos/asf/stratos/blob/242b27db/samples/cartridges/kubernetes/php.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/php.json b/samples/cartridges/kubernetes/php.json index 8d2c9a0..f14ac1b 100755 --- a/samples/cartridges/kubernetes/php.json +++ b/samples/cartridges/kubernetes/php.json @@ -31,11 +31,11 @@ "property": [ { "name": "KUBERNETES_CONTAINER_CPU", - "value": "1" + "value": "0" }, { "name": "KUBERNETES_CONTAINER_MEMORY", - "value": "512" + "value": "0" } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/242b27db/samples/network-partitions/kubernetes/network-partition-2.json ---------------------------------------------------------------------- diff --git a/samples/network-partitions/kubernetes/network-partition-2.json b/samples/network-partitions/kubernetes/network-partition-2.json index 9fd3a2d..8f9f053 100644 --- a/samples/network-partitions/kubernetes/network-partition-2.json +++ b/samples/network-partitions/kubernetes/network-partition-2.json @@ -7,7 +7,7 @@ "property": [ { "name": "cluster", - "value": "kubernetes-cluster-1" + "value": "kubernetes-cluster-2" } ] }
