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/02/27 15:46:58 UTC
[35/50] [abbrv] stratos git commit: updating wordpress-extended-v2
sample
updating wordpress-extended-v2 sample
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a313172d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a313172d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a313172d
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: a313172deeb694a5b17cd1d998957d4411c25323
Parents: cfb4c19
Author: R-Rajkumar <rr...@gmail.com>
Authored: Thu Feb 26 16:43:14 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Fri Feb 27 19:42:43 2015 +0530
----------------------------------------------------------------------
.../artifacts/application-policy.json | 12 ++++++++++++
.../wordpress-extended-v2/artifacts/application.json | 15 +++++++++------
.../artifacts/deployment-policy.json | 15 +++++++++++++++
.../artifacts/network-partition-2.json | 15 +++++++++++++++
.../artifacts/network-partition.json | 15 +++++++++++++++
.../wordpress-extended-v2/scripts/common/deploy.sh | 9 ++++++++-
6 files changed, 74 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a313172d/samples/applications/wordpress-extended-v2/artifacts/application-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/artifacts/application-policy.json b/samples/applications/wordpress-extended-v2/artifacts/application-policy.json
new file mode 100644
index 0000000..5aa91dd
--- /dev/null
+++ b/samples/applications/wordpress-extended-v2/artifacts/application-policy.json
@@ -0,0 +1,12 @@
+{
+ "networkPartition":[
+ {
+ "id":"network-partition-1",
+ "activeByDefault":"true"
+ },
+ {
+ "id":"network-partition-2",
+ "activeByDefault":"false"
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a313172d/samples/applications/wordpress-extended-v2/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/artifacts/application.json b/samples/applications/wordpress-extended-v2/artifacts/application.json
index 11cc0e6..e5b1ae7 100644
--- a/samples/applications/wordpress-extended-v2/artifacts/application.json
+++ b/samples/applications/wordpress-extended-v2/artifacts/application.json
@@ -1,11 +1,11 @@
{
"applicationId": "wordpress-extended",
- "alias": "wordpress",
+ "alias": "my-wordpress",
"components": {
"groups": [
{
"name": "mysql-php-group",
- "alias": "mysql-php-group1",
+ "alias": "my-mysql-php-group",
"groupMinInstances": 2,
"groupMaxInstances": 2,
"cartridges": [
@@ -14,7 +14,8 @@
"cartridgeMin": 2,
"cartridgeMax": 5,
"subscribableInfo": {
- "alias": "mysql1",
+ "alias": "my-mysql",
+ "deploymentPolicy":"deployment-policy-1",
"autoscalingPolicy": "autoscaling-policy-1"
}
},
@@ -23,7 +24,8 @@
"cartridgeMin": 2,
"cartridgeMax": 5,
"subscribableInfo": {
- "alias": "php1",
+ "alias": "my-php",
+ "deploymentPolicy":"deployment-policy-1",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -40,7 +42,8 @@
"cartridgeMin": 2,
"cartridgeMax": 5,
"subscribableInfo": {
- "alias": "tomcat1",
+ "alias": "my-tomcat",
+ "deploymentPolicy":"deployment-policy-1",
"autoscalingPolicy": "autoscaling-policy-1",
"artifactRepository":{
"privateRepo":false,
@@ -51,7 +54,7 @@
],
"dependencies": {
"startupOrders": [
- "group.mysql-php-group1,cartridge.tomcat1"
+ "group.my-mysql-php-group,cartridge.my-tomcat"
],
"terminationBehaviour": "terminate-none"
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a313172d/samples/applications/wordpress-extended-v2/artifacts/deployment-policy.json
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/artifacts/deployment-policy.json b/samples/applications/wordpress-extended-v2/artifacts/deployment-policy.json
new file mode 100644
index 0000000..666c299
--- /dev/null
+++ b/samples/applications/wordpress-extended-v2/artifacts/deployment-policy.json
@@ -0,0 +1,15 @@
+{
+ "id": "deployment-policy-1",
+ "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/a313172d/samples/applications/wordpress-extended-v2/artifacts/network-partition-2.json
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/artifacts/network-partition-2.json b/samples/applications/wordpress-extended-v2/artifacts/network-partition-2.json
new file mode 100644
index 0000000..0d07838
--- /dev/null
+++ b/samples/applications/wordpress-extended-v2/artifacts/network-partition-2.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-2",
+ "partitions": [
+ {
+ "id": "partition-2",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a313172d/samples/applications/wordpress-extended-v2/artifacts/network-partition.json
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/artifacts/network-partition.json b/samples/applications/wordpress-extended-v2/artifacts/network-partition.json
new file mode 100644
index 0000000..2a5b7ec
--- /dev/null
+++ b/samples/applications/wordpress-extended-v2/artifacts/network-partition.json
@@ -0,0 +1,15 @@
+{
+ "id": "network-partition-1",
+ "partitions": [
+ {
+ "id": "partition-1",
+ "provider": "mock",
+ "property": [
+ {
+ "name": "region",
+ "value": "default"
+ }
+ ]
+ }
+ ]
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a313172d/samples/applications/wordpress-extended-v2/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/wordpress-extended-v2/scripts/common/deploy.sh b/samples/applications/wordpress-extended-v2/scripts/common/deploy.sh
index 1a736a6..4672be7 100755
--- a/samples/applications/wordpress-extended-v2/scripts/common/deploy.sh
+++ b/samples/applications/wordpress-extended-v2/scripts/common/deploy.sh
@@ -23,6 +23,13 @@ echo ${artifacts_path}/autoscaling-policy.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
+echo "Adding network partitions..."
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/network-partition.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/network-partition-2.json" -k -v -u admin:admin https://${host_ip}:9443/api/networkPartitions
+
+echo "Adding deployment policy..."
+curl -X POST -H "Content-Type: application/json" -d "@${artifacts_path}/deployment-policy.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/deploymentPolicies
+
echo "Adding mysql cartridge..."
curl -X POST -H "Content-Type: application/json" -d "@${cartridges_path}/mysql.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
@@ -44,4 +51,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/wordpress-extended/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/wordpress-extended/deploy