You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ra...@apache.org on 2015/03/03 09:29:25 UTC
[1/2] stratos git commit: Fixed complex-app sample application.
Repository: stratos
Updated Branches:
refs/heads/master 5e497cb07 -> 494c643b6
Fixed complex-app sample application.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f74c4715
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f74c4715
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f74c4715
Branch: refs/heads/master
Commit: f74c4715e20db6ad8862fa3110c9c61fcb3cb892
Parents: 2573d35
Author: Dinithi <di...@wso2.com>
Authored: Tue Mar 3 13:49:50 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Tue Mar 3 13:49:50 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 8 +++
.../complex-app/artifacts/application.json | 25 ++++---
.../artifacts/deployment-policy.json | 2 +-
.../artifacts/ec2/deployment-policy.json | 70 -------------------
.../artifacts/kubernetes/deployment-policy.json | 71 --------------------
.../kubernetes/kubernetes-cluster.json | 56 ---------------
.../artifacts/mock/deployment-policy.json | 70 -------------------
.../artifacts/openstack/deployment-policy.json | 70 -------------------
.../complex-app/scripts/common/deploy.sh | 17 +++--
samples/cartridges-groups/group6c3.json | 17 +----
samples/cartridges-groups/group8c.json | 3 -
samples/cartridges-groups/tomcat2-group.json | 10 +++
12 files changed, 48 insertions(+), 371 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/application-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/application-policy.json b/samples/applications/complex-app/artifacts/application-policy.json
new file mode 100644
index 0000000..9d2c6a1
--- /dev/null
+++ b/samples/applications/complex-app/artifacts/application-policy.json
@@ -0,0 +1,8 @@
+{
+ "networkPartition":[
+ {
+ "id":"network-partition-1",
+ "activeByDefault":"true"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/application.json b/samples/applications/complex-app/artifacts/application.json
index 433b0c9..7b85f93 100644
--- a/samples/applications/complex-app/artifacts/application.json
+++ b/samples/applications/complex-app/artifacts/application.json
@@ -1,17 +1,18 @@
{
"applicationId": "complex-app",
- "alias": "complex-app-v1",
+ "alias": "my-complex-app",
"components": {
"groups": [
{
"name": "group6",
- "alias": "mygroup6",
+ "alias": "my-group6",
"groupMinInstances": 1,
"groupMaxInstances": 1,
+ "deploymentPolicy":"deployment-policy-1",
"groups": [
{
"name": "group7",
- "alias": "mygroup7",
+ "alias": "my-group7",
"groupMinInstances": 1,
"groupMaxInstances": 1,
"cartridges": [
@@ -20,7 +21,7 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "group7tom",
+ "alias": "my-tomcat1-group7",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -39,7 +40,7 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "group6tom",
+ "alias": "my-tomcat2-group6",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -53,13 +54,14 @@
},
{
"name": "group8",
- "alias": "mygroup8",
+ "alias": "my-group8",
"groupMinInstances": 1,
"groupMaxInstances": 1,
+ "deploymentPolicy":"deployment-policy-1",
"groups": [
{
"name": "group9",
- "alias": "mygroup9",
+ "alias": "my-group9",
"groupMinInstances": 1,
"groupMaxInstances": 1,
"cartridges": [
@@ -68,7 +70,7 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "group9tom",
+ "alias": "my-tomcat1-group9",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -87,7 +89,7 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "group8tom",
+ "alias": "my-tomcat2-group8",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -106,8 +108,9 @@
"cartridgeMin": 1,
"cartridgeMax": 2,
"subscribableInfo": {
- "alias": "mytomcat",
+ "alias": "my-tomcat",
"autoscalingPolicy": "autoscaling-policy-1",
+ "deploymentPolicy":"deployment-policy-1",
"artifactRepository":{
"privateRepo":false,
"repoUrl":"https://github.com/imesh/stratos-tomcat-applications.git",
@@ -119,7 +122,7 @@
],
"dependencies": {
"startupOrders": [
- "group.group8,cartridge.tomcat,group.group6"
+ "group.my-group8,cartridge.my-tomcat,group.my-group6"
],
"terminationBehaviour": "terminate-all"
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/deployment-policy.json b/samples/applications/complex-app/artifacts/deployment-policy.json
index d858aed..666c299 100644
--- a/samples/applications/complex-app/artifacts/deployment-policy.json
+++ b/samples/applications/complex-app/artifacts/deployment-policy.json
@@ -1,5 +1,5 @@
{
- "id": "deployment-policy-2",
+ "id": "deployment-policy-1",
"networkPartition": [
{
"id": "network-partition-1",
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/ec2/deployment-policy.json b/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
deleted file mode 100644
index 94ce8cb..0000000
--- a/samples/applications/complex-app/artifacts/ec2/deployment-policy.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "network-partition-1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "partition-1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mytomcat",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup6",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup8",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json b/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
deleted file mode 100644
index 3a6c693..0000000
--- a/samples/applications/complex-app/artifacts/kubernetes/deployment-policy.json
+++ /dev/null
@@ -1,71 +0,0 @@
-{
- "applicationPolicy": {
- "networkPartition": [
- {
- "id":"network-partition-1",
- "kubernetesClusterId":"kubernetes-cluster-1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "partition-1",
- "provider": "mock",
- "property": [
- {
- "name": "region",
- "value": "default"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mytomcat",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup6",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup8",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/kubernetes/kubernetes-cluster.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/kubernetes/kubernetes-cluster.json b/samples/applications/complex-app/artifacts/kubernetes/kubernetes-cluster.json
deleted file mode 100644
index 2988ed1..0000000
--- a/samples/applications/complex-app/artifacts/kubernetes/kubernetes-cluster.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
- "clusterId": "kubernetes-cluster-1",
- "description": "Kubernetes CoreOS cluster",
- "kubernetesMaster": {
- "hostId": "KubHostMaster1",
- "hostname": "master.dev.kubernetes.example.org",
- "privateIPAddress": "172.17.8.100",
- "publicIPAddress": "172.17.8.100",
- "property": [
- ]
- },
- "portRange": {
- "upper": "5000",
- "lower": "4500"
- },
- "kubernetesHosts": [
- {
- "hostId": "KubHostSlave1",
- "hostname": "slave1.dev.kubernetes.example.org",
- "privateIPAddress": "172.17.8.101",
- "publicIPAddress": "172.17.8.101",
- "property": [
- ]
- },
- {
- "hostId": "KubHostSlave2",
- "hostname": "slave2.dev.kubernetes.example.org",
- "privateIPAddress": "172.17.8.102",
- "publicIPAddress": "172.17.8.102",
- "property": [
- ]
- }
- ],
- "property": [
- {
- "name": "payload_parameter.MB_IP",
- "value": "172.17.8.1"
- },
- {
- "name": "payload_parameter.MB_PORT",
- "value": "1883"
- },
- {
- "name": "payload_parameter.CEP_IP",
- "value": "172.17.8.1"
- },
- {
- "name": "payload_parameter.CEP_PORT",
- "value": "7711"
- },
- {
- "name": "payload_parameter.LOG_LEVEL",
- "value": "DEBUG"
- }
- ]
-}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/mock/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/mock/deployment-policy.json b/samples/applications/complex-app/artifacts/mock/deployment-policy.json
deleted file mode 100644
index e90b9fb..0000000
--- a/samples/applications/complex-app/artifacts/mock/deployment-policy.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "network-partition-1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "partition-1",
- "provider": "mock",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mytomcat",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup6",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup8",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/artifacts/openstack/deployment-policy.json b/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
deleted file mode 100644
index 66a28a0..0000000
--- a/samples/applications/complex-app/artifacts/openstack/deployment-policy.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
- "applicationPolicy": {
- "networkPartition": [
- {
- "id": "network-partition-1",
- "activeByDefault": "true",
- "partitions": [
- {
- "id": "partition-1",
- "provider": "openstack",
- "property": [
- {
- "name": "region",
- "value": "RegionOne"
- }
- ]
- }
- ]
- }
- ]
- },
- "childPolicies": [
- {
- "alias": "mytomcat",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup6",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- },
- {
- "alias": "mygroup8",
- "networkPartition": [
- {
- "id": "network-partition-1",
- "partitionAlgo": "one-after-another",
- "partitions": [
- {
- "id": "partition-1",
- "max": 5
- }
- ]
- }
- ]
- }
- ]
-}
-
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/applications/complex-app/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/complex-app/scripts/common/deploy.sh b/samples/applications/complex-app/scripts/common/deploy.sh
index 184b9ef..a9f9e0c 100755
--- a/samples/applications/complex-app/scripts/common/deploy.sh
+++ b/samples/applications/complex-app/scripts/common/deploy.sh
@@ -11,6 +11,9 @@ 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`
set -e
@@ -19,9 +22,15 @@ if [[ -z "${iaas}" ]]; then
exit
fi
-echo ${artifacts_path}/autoscaling-policy.json
+echo ${autoscaling_policies_path}/autoscaling-policy-1.json
echo "Adding autoscale policy..."
-curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/autoscaling-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
+curl -X POST -H "Content-Type: application/json" -d "@${autoscaling_policies_path}/autoscaling-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/autoscalingPolicies
+
+echo "Adding network partitions..."
+curl -X POST -H "Content-Type: application/json" -d "@${network_partitions_path}/network-partition-1.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions
+
+echo "Adding deployment policies..."
+curl -X POST -H "Content-Type: application/json" -d "@${deployment_policies_path}/deployment-policy-1.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies
echo "Adding tomcat cartridge..."
curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
@@ -33,7 +42,7 @@ echo "Adding tomcat2 cartridge..."
curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/tomcat2.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
echo "Adding group6c group..."
-curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/group6c.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups
+curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/group6c3.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups
echo "Adding group8c group..."
curl -X POST -H "Content-Type: application/json" -d "@${cartridges_groups_path}/group8c.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridgeGroups
@@ -46,4 +55,4 @@ curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/applicat
sleep 1
echo "Deploying application..."
-curl -X POST -H "Content-Type: application/json" -d "@${iaas_artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/complex-app/deploy
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/application-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/applications/complex-app/deploy
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/cartridges-groups/group6c3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges-groups/group6c3.json b/samples/cartridges-groups/group6c3.json
index 6a64b18..a7cc378 100644
--- a/samples/cartridges-groups/group6c3.json
+++ b/samples/cartridges-groups/group6c3.json
@@ -4,30 +4,17 @@
{
"name": "group7",
"cartridges": [
- "tomcat1",
- "tomcat2"
+ "tomcat1"
],
"dependencies": {
- "startupOrders": [
- "cartridge.tomcat1,cartridge.tomcat2"
- ],
"terminationBehaviour": "terminate-all"
}
- },
- {
- "name": "group8",
- "cartridges": [
- "tomcat1"
- ]
}
- ],
+ ],
"cartridges": [
"tomcat2"
],
"dependencies": {
- "startupOrders": [
- "group.group7,cartridge.tomcat2,group.group8"
- ],
"terminationBehaviour": "terminate-all"
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/cartridges-groups/group8c.json
----------------------------------------------------------------------
diff --git a/samples/cartridges-groups/group8c.json b/samples/cartridges-groups/group8c.json
index fac2096..f389b0c 100644
--- a/samples/cartridges-groups/group8c.json
+++ b/samples/cartridges-groups/group8c.json
@@ -12,9 +12,6 @@
"tomcat2"
],
"dependencies": {
- "startupOrders": [
- "group.group9,cartridge.tomcat2"
- ],
"terminationBehaviour": "terminate-all"
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/f74c4715/samples/cartridges-groups/tomcat2-group.json
----------------------------------------------------------------------
diff --git a/samples/cartridges-groups/tomcat2-group.json b/samples/cartridges-groups/tomcat2-group.json
new file mode 100644
index 0000000..8d83224
--- /dev/null
+++ b/samples/cartridges-groups/tomcat2-group.json
@@ -0,0 +1,10 @@
+{
+ "name": "tomcat2-group",
+ "groupScalingEnabled": "true",
+ "cartridges": [
+ "tomcat2"
+ ],
+ "dependencies": {
+ "terminationBehaviour": "terminate-all"
+ }
+}
[2/2] stratos git commit: This closes #252 on GitHub
Posted by ra...@apache.org.
This closes #252 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/494c643b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/494c643b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/494c643b
Branch: refs/heads/master
Commit: 494c643b63557b93bd8bfe74125c2f6afa15b53d
Parents: 5e497cb f74c471
Author: R-Rajkumar <rr...@gmail.com>
Authored: Tue Mar 3 13:58:26 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Tue Mar 3 13:58:26 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 8 +++
.../complex-app/artifacts/application.json | 25 ++++---
.../artifacts/deployment-policy.json | 2 +-
.../artifacts/ec2/deployment-policy.json | 70 -------------------
.../artifacts/kubernetes/deployment-policy.json | 71 --------------------
.../kubernetes/kubernetes-cluster.json | 56 ---------------
.../artifacts/mock/deployment-policy.json | 70 -------------------
.../artifacts/openstack/deployment-policy.json | 70 -------------------
.../complex-app/scripts/common/deploy.sh | 17 +++--
samples/cartridges-groups/group6c3.json | 17 +----
samples/cartridges-groups/group8c.json | 3 -
samples/cartridges-groups/tomcat2-group.json | 10 +++
12 files changed, 48 insertions(+), 371 deletions(-)
----------------------------------------------------------------------