Repository: stratos Updated Branches: refs/heads/master 242b27db0 -> a28aceca1
http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/db-group.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/db-group.json b/samples/cartridge-groups/db-group.json index 3808caf..1ca2cd1 100644 --- a/samples/cartridge-groups/db-group.json +++ b/samples/cartridge-groups/db-group.json @@ -1,13 +1,13 @@ { - "name": "db-group", - "cartridges": [ - "mysql", - "postgres" - ], - "dependencies": { - "terminationBehaviour": "terminate-all" - }, - "groupScalingEnabled": true - } + "name": "db-group", + "cartridges": [ + "mysql", + "postgres" + ], + "dependencies": { + "terminationBehaviour": "terminate-all" + }, + "groupScalingEnabled": true +} http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/esb-php-group.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/esb-php-group.json b/samples/cartridge-groups/esb-php-group.json index c702da9..008c735 100644 --- a/samples/cartridge-groups/esb-php-group.json +++ b/samples/cartridge-groups/esb-php-group.json @@ -7,7 +7,7 @@ "dependencies": { "startupOrders": [ { - "aliases" : [ + "aliases": [ "cartridge.my-esb", "cartridge.my-php" ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/esb-php-nested-with-esb-php-nested-with-mysql-php.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/esb-php-nested-with-esb-php-nested-with-mysql-php.json b/samples/cartridge-groups/esb-php-nested-with-esb-php-nested-with-mysql-php.json index fca40f3..2d7972c 100644 --- a/samples/cartridge-groups/esb-php-nested-with-esb-php-nested-with-mysql-php.json +++ b/samples/cartridge-groups/esb-php-nested-with-esb-php-nested-with-mysql-php.json @@ -3,15 +3,15 @@ "groups": [ { "name": "esb-php-nested-with-mysql-php", - "groups": [ - { - "name": "mysql-php", - "cartridges": [ - "mysql", - "php" - ] - } - ], + "groups": [ + { + "name": "mysql-php", + "cartridges": [ + "mysql", + "php" + ] + } + ], "cartridges": [ "esb", "php" http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/group1.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/group1.json b/samples/cartridge-groups/group1.json index 652e9bd..8fc36dd 100644 --- a/samples/cartridge-groups/group1.json +++ b/samples/cartridge-groups/group1.json @@ -10,7 +10,7 @@ "dependencies": { "startupOrders": [ { - "aliases" : [ + "aliases": [ "cartridge.my-c3-group2", "cartridge.my-c2-group2" ] @@ -26,7 +26,7 @@ "dependencies": { "startupOrders": [ { - "aliases" : [ + "aliases": [ "cartridge.my-c1-group1", "group.my-group2" ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/group1b.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/group1b.json b/samples/cartridge-groups/group1b.json index 2ed4b8e..3d71015 100644 --- a/samples/cartridge-groups/group1b.json +++ b/samples/cartridge-groups/group1b.json @@ -7,7 +7,7 @@ "dependencies": { "startupOrders": [ { - "aliases" : [ + "aliases": [ "cartridge.my-c3", "cartridge.my-c2" ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/group6c3.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/group6c3.json b/samples/cartridge-groups/group6c3.json index a7cc378..58b2096 100644 --- a/samples/cartridge-groups/group6c3.json +++ b/samples/cartridge-groups/group6c3.json @@ -10,7 +10,7 @@ "terminationBehaviour": "terminate-all" } } - ], + ], "cartridges": [ "tomcat2" ], http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/group6c6.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/group6c6.json b/samples/cartridge-groups/group6c6.json index 23b76e9..258aa4a 100644 --- a/samples/cartridge-groups/group6c6.json +++ b/samples/cartridge-groups/group6c6.json @@ -7,7 +7,7 @@ "dependencies": { "startupOrders": [ { - "aliases" : [ + "aliases": [ "cartridge.tomcat2", "cartridge.tomcat1" ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/group6c7.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/group6c7.json b/samples/cartridge-groups/group6c7.json index f693153..19aafb6 100644 --- a/samples/cartridge-groups/group6c7.json +++ b/samples/cartridge-groups/group6c7.json @@ -4,21 +4,23 @@ { "name": "group7", "cartridges": [ - "tomcat", "tomcat1" + "tomcat", + "tomcat1" ], "dependencies": { "terminationBehaviour": "terminate-none", "startupOrders": [] } }, - { + { "name": "group-tom2", "dependencies": { "terminationBehaviour": "terminate-none", "startupOrders": [] }, "cartridges": [ - "tomcat2","tomcat3" + "tomcat2", + "tomcat3" ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/n-level-nesting.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/n-level-nesting.json b/samples/cartridge-groups/n-level-nesting.json index 8e2b318..dc0e57e 100644 --- a/samples/cartridge-groups/n-level-nesting.json +++ b/samples/cartridge-groups/n-level-nesting.json @@ -8,41 +8,41 @@ "tomcat" ], "groups": [ - { - "name": "level-two-group", - "cartridges": [ - "esb", - "tomcat" - ], + { + "name": "level-two-group", + "cartridges": [ + "esb", + "tomcat" + ], "groups": [ - { - "name": "level-three-group", - "cartridges": [ - "esb", - "tomcat" - ], - "groups": [ - { - "name": "level-four-group", - "cartridges": [ - "esb", - "tomcat" - ], - "groups": [ - { - "name": "level-five-group", - "cartridges": [ - "esb", - "tomcat" - ] - } - ] - } - ] - } - ] - } - ] + { + "name": "level-three-group", + "cartridges": [ + "esb", + "tomcat" + ], + "groups": [ + { + "name": "level-four-group", + "cartridges": [ + "esb", + "tomcat" + ], + "groups": [ + { + "name": "level-five-group", + "cartridges": [ + "esb", + "tomcat" + ] + } + ] + } + ] + } + ] + } + ] } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridge-groups/tomcat-group.json ---------------------------------------------------------------------- diff --git a/samples/cartridge-groups/tomcat-group.json b/samples/cartridge-groups/tomcat-group.json index 2bdcfb6..673d6ff 100644 --- a/samples/cartridge-groups/tomcat-group.json +++ b/samples/cartridge-groups/tomcat-group.json @@ -5,7 +5,7 @@ "name": "tomcat-group", "cartridges": [ "tomcat1", - "tomcat2" + "tomcat2" ] } ], http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/c1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/c1.json b/samples/cartridges/ec2/c1.json index 13d370e..d468e85 100755 --- a/samples/cartridges/ec2/c1.json +++ b/samples/cartridges/ec2/c1.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/c2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/c2.json b/samples/cartridges/ec2/c2.json index 84cc8ec..5e86486 100755 --- a/samples/cartridges/ec2/c2.json +++ b/samples/cartridges/ec2/c2.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/c3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/c3.json b/samples/cartridges/ec2/c3.json index ab6ba24..8003167 100755 --- a/samples/cartridges/ec2/c3.json +++ b/samples/cartridges/ec2/c3.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/c4.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/c4.json b/samples/cartridges/ec2/c4.json index 024edac..0e11cf6 100755 --- a/samples/cartridges/ec2/c4.json +++ b/samples/cartridges/ec2/c4.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/esb.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/esb.json b/samples/cartridges/ec2/esb.json index b44b96d..bd8c618 100755 --- a/samples/cartridges/ec2/esb.json +++ b/samples/cartridges/ec2/esb.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/php.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/php.json b/samples/cartridges/ec2/php.json index 73fe441..204711c 100755 --- a/samples/cartridges/ec2/php.json +++ b/samples/cartridges/ec2/php.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/tomcat.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/tomcat.json b/samples/cartridges/ec2/tomcat.json index 588650c..9819144 100755 --- a/samples/cartridges/ec2/tomcat.json +++ b/samples/cartridges/ec2/tomcat.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/tomcat1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/tomcat1.json b/samples/cartridges/ec2/tomcat1.json index 9189d66..13198a1 100755 --- a/samples/cartridges/ec2/tomcat1.json +++ b/samples/cartridges/ec2/tomcat1.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/ec2/tomcat2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/ec2/tomcat2.json b/samples/cartridges/ec2/tomcat2.json index 8923998..e89ff69 100755 --- a/samples/cartridges/ec2/tomcat2.json +++ b/samples/cartridges/ec2/tomcat2.json @@ -20,7 +20,6 @@ { "type": "ec2", "imageId": "ap-southeast-1/ami-3c0f5d6e", - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/c1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c1.json b/samples/cartridges/kubernetes/c1.json index 19ac4c0..7ecb08e 100755 --- a/samples/cartridges/kubernetes/c1.json +++ b/samples/cartridges/kubernetes/c1.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/c2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c2.json b/samples/cartridges/kubernetes/c2.json index 8caa83a..d3180e5 100755 --- a/samples/cartridges/kubernetes/c2.json +++ b/samples/cartridges/kubernetes/c2.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/c3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c3.json b/samples/cartridges/kubernetes/c3.json index dedb0f6..fecb50b 100755 --- a/samples/cartridges/kubernetes/c3.json +++ b/samples/cartridges/kubernetes/c3.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/c4.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/c4.json b/samples/cartridges/kubernetes/c4.json index efc660a..349f8b3 100755 --- a/samples/cartridges/kubernetes/c4.json +++ b/samples/cartridges/kubernetes/c4.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/esb.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/esb.json b/samples/cartridges/kubernetes/esb.json index 2b775a8..c5cb500 100755 --- a/samples/cartridges/kubernetes/esb.json +++ b/samples/cartridges/kubernetes/esb.json @@ -14,19 +14,19 @@ "proxyPort": "8280" } ], - "deployment":{ - "baseDir":"/var/www" + "deployment": { + "baseDir": "/var/www" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"stratos/cartridge:4.1.0-alpha", - "networkInterfaces":[ - { - "networkUuid":"" - } + "type": "kubernetes", + "imageId": "stratos/cartridge:4.1.0-alpha", + "networkInterfaces": [ + { + "networkUuid": "" + } ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/tomcat.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat.json b/samples/cartridges/kubernetes/tomcat.json index 8441233..47208ab 100755 --- a/samples/cartridges/kubernetes/tomcat.json +++ b/samples/cartridges/kubernetes/tomcat.json @@ -7,7 +7,7 @@ "description": "Tomcat 7 Cartridge", "version": "7", "multiTenant": "false", - "loadBalancingIPType" : "public", + "loadBalancingIPType": "public", "portMapping": [ { "protocol": "http", @@ -15,16 +15,16 @@ "proxyPort": "8281" } ], - "deployment":{ - "baseDir":"/opt/tomcat/webapps" + "deployment": { + "baseDir": "/opt/tomcat/webapps" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"stratos/tomcat:4.1.0-beta", - "networkInterfaces":[ + "type": "kubernetes", + "imageId": "stratos/tomcat:4.1.0-beta", + "networkInterfaces": [ ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/tomcat1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat1.json b/samples/cartridges/kubernetes/tomcat1.json index d3a68c4..cf32329 100755 --- a/samples/cartridges/kubernetes/tomcat1.json +++ b/samples/cartridges/kubernetes/tomcat1.json @@ -14,19 +14,19 @@ "proxyPort": "8280" } ], - "deployment":{ - "baseDir":"/var/www" + "deployment": { + "baseDir": "/var/www" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"stratos/cartridge:4.1.0-alpha", - "networkInterfaces":[ - { - "networkUuid":"" - } + "type": "kubernetes", + "imageId": "stratos/cartridge:4.1.0-alpha", + "networkInterfaces": [ + { + "networkUuid": "" + } ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/tomcat2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat2.json b/samples/cartridges/kubernetes/tomcat2.json index 46ee867..b0175e8 100755 --- a/samples/cartridges/kubernetes/tomcat2.json +++ b/samples/cartridges/kubernetes/tomcat2.json @@ -14,19 +14,19 @@ "proxyPort": "8280" } ], - "deployment":{ - "baseDir":"/var/www" + "deployment": { + "baseDir": "/var/www" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"stratos/cartridge:4.1.0-alpha", - "networkInterfaces":[ - { - "networkUuid":"" - } + "type": "kubernetes", + "imageId": "stratos/cartridge:4.1.0-alpha", + "networkInterfaces": [ + { + "networkUuid": "" + } ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/tomcat3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/tomcat3.json b/samples/cartridges/kubernetes/tomcat3.json index e4d39f9..f7293cc 100755 --- a/samples/cartridges/kubernetes/tomcat3.json +++ b/samples/cartridges/kubernetes/tomcat3.json @@ -14,16 +14,16 @@ "proxyPort": "8280" } ], - "deployment":{ - "baseDir":"/opt/tomcat/webapps" + "deployment": { + "baseDir": "/opt/tomcat/webapps" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"chamilad/tomcat:4.1.0-beta", - "networkInterfaces":[ + "type": "kubernetes", + "imageId": "chamilad/tomcat:4.1.0-beta", + "networkInterfaces": [ ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/kubernetes/wso2-is.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/kubernetes/wso2-is.json b/samples/cartridges/kubernetes/wso2-is.json index 8b4bfe7..b3b2f20 100644 --- a/samples/cartridges/kubernetes/wso2-is.json +++ b/samples/cartridges/kubernetes/wso2-is.json @@ -14,13 +14,13 @@ "proxyPort": "8280" } ], - "iaasProvider":[ + "iaasProvider": [ { - "type":"kubernetes", - "imageId":"chamilad/wso2is:4.1.0-beta", - "networkInterfaces":[ + "type": "kubernetes", + "imageId": "chamilad/wso2is:4.1.0-beta", + "networkInterfaces": [ ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/c1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/c1.json b/samples/cartridges/mock/c1.json index 19ac4c0..7ecb08e 100755 --- a/samples/cartridges/mock/c1.json +++ b/samples/cartridges/mock/c1.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/c2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/c2.json b/samples/cartridges/mock/c2.json index 8caa83a..d3180e5 100755 --- a/samples/cartridges/mock/c2.json +++ b/samples/cartridges/mock/c2.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/c3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/c3.json b/samples/cartridges/mock/c3.json index dedb0f6..fecb50b 100755 --- a/samples/cartridges/mock/c3.json +++ b/samples/cartridges/mock/c3.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/c4.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/c4.json b/samples/cartridges/mock/c4.json index efc660a..349f8b3 100755 --- a/samples/cartridges/mock/c4.json +++ b/samples/cartridges/mock/c4.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/esb.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/esb.json b/samples/cartridges/mock/esb.json index e96b9c9..f9b5c6f 100755 --- a/samples/cartridges/mock/esb.json +++ b/samples/cartridges/mock/esb.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", @@ -42,5 +41,9 @@ ] } ], - "metadataKeys":["server_ip","username","password"] + "metadataKeys": [ + "server_ip", + "username", + "password" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/mysql.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/mysql.json b/samples/cartridges/mock/mysql.json index 7f4415e..606c5f5 100755 --- a/samples/cartridges/mock/mysql.json +++ b/samples/cartridges/mock/mysql.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", @@ -42,5 +41,9 @@ ] } ], - "metadataKeys":["server_ip","username","password"] + "metadataKeys": [ + "server_ip", + "username", + "password" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/postgres.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/postgres.json b/samples/cartridges/mock/postgres.json index 5bc4bdb..605a8f2 100755 --- a/samples/cartridges/mock/postgres.json +++ b/samples/cartridges/mock/postgres.json @@ -25,7 +25,6 @@ "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" } ], - "property": [ { "name": "instanceType", @@ -42,5 +41,9 @@ ] } ], - "metadataKeys":["server_ip","username","password"] + "metadataKeys": [ + "server_ip", + "username", + "password" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/stratos-lb.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/stratos-lb.json b/samples/cartridges/mock/stratos-lb.json index 216eae3..2553161 100755 --- a/samples/cartridges/mock/stratos-lb.json +++ b/samples/cartridges/mock/stratos-lb.json @@ -36,6 +36,8 @@ ] } ], - "metadataKeys":["writeparam3","writeparam4"] - + "metadataKeys": [ + "writeparam3", + "writeparam4" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/tomcat.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/tomcat.json b/samples/cartridges/mock/tomcat.json index 0ea1217..19b36a3 100755 --- a/samples/cartridges/mock/tomcat.json +++ b/samples/cartridges/mock/tomcat.json @@ -41,6 +41,7 @@ ] } ], - "metadataKeys":["url"] - + "metadataKeys": [ + "url" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/tomcat2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/tomcat2.json b/samples/cartridges/mock/tomcat2.json index 1f8811d..dea114d 100755 --- a/samples/cartridges/mock/tomcat2.json +++ b/samples/cartridges/mock/tomcat2.json @@ -41,5 +41,8 @@ ] } ], - "metadataKeys":["writeparam5","writeparam6"] + "metadataKeys": [ + "writeparam5", + "writeparam6" + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/tomcat3.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/tomcat3.json b/samples/cartridges/mock/tomcat3.json index d6dc7ee..cdc44f4 100755 --- a/samples/cartridges/mock/tomcat3.json +++ b/samples/cartridges/mock/tomcat3.json @@ -14,16 +14,16 @@ "proxyPort": "8280" } ], - "deployment":{ - "baseDir":"/opt/tomcat/webapps" + "deployment": { + "baseDir": "/opt/tomcat/webapps" }, - "iaasProvider":[ + "iaasProvider": [ { - "type":"mock", - "imageId":"not-needed", - "networkInterfaces":[ + "type": "mock", + "imageId": "not-needed", + "networkInterfaces": [ ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/mock/wso2-is.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/mock/wso2-is.json b/samples/cartridges/mock/wso2-is.json index e71ed2d..2933227 100644 --- a/samples/cartridges/mock/wso2-is.json +++ b/samples/cartridges/mock/wso2-is.json @@ -14,13 +14,13 @@ "proxyPort": "8280" } ], - "iaasProvider":[ + "iaasProvider": [ { - "type":"mock", - "imageId":"not-needed", - "networkInterfaces":[ + "type": "mock", + "imageId": "not-needed", + "networkInterfaces": [ ], - "property":[ + "property": [ ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/openstack/tomcat.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/openstack/tomcat.json b/samples/cartridges/openstack/tomcat.json index c1965f7..7e4ca32 100755 --- a/samples/cartridges/openstack/tomcat.json +++ b/samples/cartridges/openstack/tomcat.json @@ -19,27 +19,26 @@ "iaasProvider": [ { "type": "openstack", - "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff", - "networkInterfaces":[ - { - "networkUuid":"b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], - "property": [ - { - "name":"instanceType", - "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name":"keyPair", - "value":"vishanth-key" - }, - { - "name":"securityGroups", - "value":"default" - } + "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff", + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], + "property": [ + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } ] - } ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/openstack/tomcat1.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/openstack/tomcat1.json b/samples/cartridges/openstack/tomcat1.json index 2c3627f..ccc3547 100755 --- a/samples/cartridges/openstack/tomcat1.json +++ b/samples/cartridges/openstack/tomcat1.json @@ -20,25 +20,24 @@ { "type": "openstack", "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff", - "networkInterfaces":[ - { - "networkUuid":"b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], "property": [ - { - "name":"instanceType", - "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name":"keyPair", - "value":"vishanth-key" - }, - { - "name":"securityGroups", - "value":"default" - } - + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/cartridges/openstack/tomcat2.json ---------------------------------------------------------------------- diff --git a/samples/cartridges/openstack/tomcat2.json b/samples/cartridges/openstack/tomcat2.json index f55ab09..02f23a9 100755 --- a/samples/cartridges/openstack/tomcat2.json +++ b/samples/cartridges/openstack/tomcat2.json @@ -20,25 +20,24 @@ { "type": "openstack", "imageId": "RegionOne/4c812285-d761-4208-b4b3-d453eace5aff", - "networkInterfaces":[ - { - "networkUuid":"b55f009a-1cc6-4b17-924f-4ae0ee18db5e" - } - ], + "networkInterfaces": [ + { + "networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e" + } + ], "property": [ - { - "name":"instanceType", - "value":"RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" - }, - { - "name":"keyPair", - "value":"vishanth-key" - }, - { - "name":"securityGroups", - "value":"default" - } - + { + "name": "instanceType", + "value": "RegionOne/aa5f45a2-c6d6-419d-917a-9dd2e3888594" + }, + { + "name": "keyPair", + "value": "vishanth-key" + }, + { + "name": "securityGroups", + "value": "default" + } ] } ] http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/deployment-policies/deployment-policy-1.json ---------------------------------------------------------------------- diff --git a/samples/deployment-policies/deployment-policy-1.json b/samples/deployment-policies/deployment-policy-1.json index 5e5b1b2..a434226 100644 --- a/samples/deployment-policies/deployment-policy-1.json +++ b/samples/deployment-policies/deployment-policy-1.json @@ -1,15 +1,15 @@ { - "id": "deployment-policy-1", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - } - ] + "id": "deployment-policy-1", + "networkPartitions": [ + { + "id": "network-partition-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/deployment-policies/deployment-policy-2.json ---------------------------------------------------------------------- diff --git a/samples/deployment-policies/deployment-policy-2.json b/samples/deployment-policies/deployment-policy-2.json index 607af7a..c62eda7 100644 --- a/samples/deployment-policies/deployment-policy-2.json +++ b/samples/deployment-policies/deployment-policy-2.json @@ -1,29 +1,29 @@ { - "id": "deployment-policy-2", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 5 - } - ] - }, - { - "id": "network-partition-2", - "partitionAlgo": "round-robin", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 5 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 5 - } - ] - } - ] + "id": "deployment-policy-2", + "networkPartitions": [ + { + "id": "network-partition-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 5 + } + ] + }, + { + "id": "network-partition-2", + "partitionAlgo": "round-robin", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "partitionMax": 5 + }, + { + "id": "network-partition-2-partition-2", + "partitionMax": 5 + } + ] + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/deployment-policies/deployment-policy-3.json ---------------------------------------------------------------------- diff --git a/samples/deployment-policies/deployment-policy-3.json b/samples/deployment-policies/deployment-policy-3.json index dad0be3..604e87e 100644 --- a/samples/deployment-policies/deployment-policy-3.json +++ b/samples/deployment-policies/deployment-policy-3.json @@ -1,15 +1,15 @@ { - "id": "deployment-policy-3", - "networkPartitions": [ - { - "id": "network-partition-3", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 5 - } - ] - } - ] + "id": "deployment-policy-3", + "networkPartitions": [ + { + "id": "network-partition-3", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 5 + } + ] + } + ] } http://git-wip-us.apache.org/repos/asf/stratos/blob/a28aceca/samples/deployment-policies/deployment-policy-4.json ---------------------------------------------------------------------- diff --git a/samples/deployment-policies/deployment-policy-4.json b/samples/deployment-policies/deployment-policy-4.json index 60c2952..f0202ef 100644 --- a/samples/deployment-policies/deployment-policy-4.json +++ b/samples/deployment-policies/deployment-policy-4.json @@ -1,49 +1,49 @@ { - "id": "deployment-policy-4", - "networkPartitions": [ - { - "id": "network-partition-1", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-2", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "network-partition-2-partition-1", - "partitionMax": 20 - }, - { - "id": "network-partition-2-partition-2", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-3", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - }, - { - "id": "network-partition-4", - "partitionAlgo": "one-after-another", - "partitions": [ - { - "id": "partition-1", - "partitionMax": 20 - } - ] - } - ] + "id": "deployment-policy-4", + "networkPartitions": [ + { + "id": "network-partition-1", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + }, + { + "id": "network-partition-2", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "network-partition-2-partition-1", + "partitionMax": 20 + }, + { + "id": "network-partition-2-partition-2", + "partitionMax": 20 + } + ] + }, + { + "id": "network-partition-3", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + }, + { + "id": "network-partition-4", + "partitionAlgo": "one-after-another", + "partitions": [ + { + "id": "partition-1", + "partitionMax": 20 + } + ] + } + ] }
