You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/17 18:59:30 UTC
[09/50] [abbrv] stratos git commit: remove maxInstanceLimit from
sample and other references
remove maxInstanceLimit from sample and other references
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/a9b2cff6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/a9b2cff6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/a9b2cff6
Branch: refs/heads/master-deployment-policy-fix-merge
Commit: a9b2cff6258004716da7350c450abac45a4d950d
Parents: 50ce299
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Mar 12 21:59:45 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Mar 12 21:59:45 2015 +0530
----------------------------------------------------------------------
.../src/main/resources/conf/etc/cartridge.xsd | 2 --
.../src/main/resources/conf/etc/cartridges.xsd | 2 --
samples/cartridges/ec2/c1.json | 2 +-
samples/cartridges/ec2/c2.json | 2 +-
samples/cartridges/ec2/c3.json | 2 +-
samples/cartridges/ec2/c4.json | 2 +-
samples/cartridges/ec2/esb.json | 2 +-
samples/cartridges/ec2/php.json | 2 +-
samples/cartridges/ec2/tomcat.json | 2 +-
samples/cartridges/ec2/tomcat1.json | 2 +-
samples/cartridges/ec2/tomcat2.json | 2 +-
samples/cartridges/kubernetes/c1.json | 2 +-
samples/cartridges/kubernetes/c2.json | 2 +-
samples/cartridges/kubernetes/c3.json | 2 +-
samples/cartridges/kubernetes/c4.json | 2 +-
samples/cartridges/mock/c1.json | 2 +-
samples/cartridges/mock/c2.json | 2 +-
samples/cartridges/mock/c3.json | 2 +-
samples/cartridges/mock/c4.json | 2 +-
samples/cartridges/mock/esb.json | 2 +-
samples/cartridges/mock/mysql.json | 2 +-
samples/cartridges/mock/php.json | 1 -
samples/cartridges/mock/stratos-lb.json | 1 -
samples/cartridges/mock/tomcat.json | 1 -
samples/cartridges/mock/tomcat1.json | 1 -
samples/cartridges/mock/tomcat2.json | 1 -
samples/cartridges/openstack/c1.json | 1 -
samples/cartridges/openstack/c2.json | 1 -
samples/cartridges/openstack/c3.json | 1 -
samples/cartridges/openstack/c4.json | 1 -
samples/cartridges/openstack/php.json | 1 -
.../grouping-automation-script/m1-samples/ec2/php-cart.json | 1 -
.../grouping-automation-script/m1-samples/os/php-cart.json | 1 -
.../grouping-automation-script/samples/ec2/mytest.json | 5 ++---
.../grouping-automation-script/samples/ec2/php-cart.json | 1 -
.../grouping-automation-script/samples/ec2/tomcat.json | 1 -
.../grouping-automation-script/samples/ec2/tomcat1.json | 5 ++---
.../grouping-automation-script/samples/os/php-cart.json | 5 ++---
38 files changed, 25 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridge.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridge.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridge.xsd
index c598431..83833e5 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridge.xsd
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridge.xsd
@@ -62,8 +62,6 @@
minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="scaleDownOrder"
minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="maxInstanceLimit"
- minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="imageId"
minOccurs="0" maxOccurs="1" />
<xs:element name="property"
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridges.xsd
----------------------------------------------------------------------
diff --git a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridges.xsd b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridges.xsd
index 4d7cefc..894125d 100644
--- a/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridges.xsd
+++ b/features/cloud-controller/org.apache.stratos.cloud.controller.feature/src/main/resources/conf/etc/cartridges.xsd
@@ -74,8 +74,6 @@
minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="scaleDownOrder"
minOccurs="0" maxOccurs="1" />
- <xs:element type="xs:string" name="maxInstanceLimit"
- minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="imageId"
minOccurs="0" maxOccurs="1" />
<xs:element name="property"
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/c1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/c1.json b/samples/cartridges/ec2/c1.json
index 8020bdd..13d370e 100755
--- a/samples/cartridges/ec2/c1.json
+++ b/samples/cartridges/ec2/c1.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/c2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/c2.json b/samples/cartridges/ec2/c2.json
index 384ebc7..84cc8ec 100755
--- a/samples/cartridges/ec2/c2.json
+++ b/samples/cartridges/ec2/c2.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/c3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/c3.json b/samples/cartridges/ec2/c3.json
index 886b7f4..ab6ba24 100755
--- a/samples/cartridges/ec2/c3.json
+++ b/samples/cartridges/ec2/c3.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/c4.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/c4.json b/samples/cartridges/ec2/c4.json
index 38cc646..024edac 100755
--- a/samples/cartridges/ec2/c4.json
+++ b/samples/cartridges/ec2/c4.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/esb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/esb.json b/samples/cartridges/ec2/esb.json
index 47eb86b..31564b6 100755
--- a/samples/cartridges/ec2/esb.json
+++ b/samples/cartridges/ec2/esb.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/php.json b/samples/cartridges/ec2/php.json
index fbbc0a0..e9f1e4c 100755
--- a/samples/cartridges/ec2/php.json
+++ b/samples/cartridges/ec2/php.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/tomcat.json b/samples/cartridges/ec2/tomcat.json
index a3d6b86..d26f95a 100755
--- a/samples/cartridges/ec2/tomcat.json
+++ b/samples/cartridges/ec2/tomcat.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/tomcat1.json b/samples/cartridges/ec2/tomcat1.json
index b863dfe..8b645d9 100755
--- a/samples/cartridges/ec2/tomcat1.json
+++ b/samples/cartridges/ec2/tomcat1.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/ec2/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/ec2/tomcat2.json b/samples/cartridges/ec2/tomcat2.json
index cde961d..2239006 100755
--- a/samples/cartridges/ec2/tomcat2.json
+++ b/samples/cartridges/ec2/tomcat2.json
@@ -20,7 +20,7 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/kubernetes/c1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/c1.json b/samples/cartridges/kubernetes/c1.json
index c60737d..6151024 100755
--- a/samples/cartridges/kubernetes/c1.json
+++ b/samples/cartridges/kubernetes/c1.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/kubernetes/c2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/c2.json b/samples/cartridges/kubernetes/c2.json
index 76dfd4b..eb47ada 100755
--- a/samples/cartridges/kubernetes/c2.json
+++ b/samples/cartridges/kubernetes/c2.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/kubernetes/c3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/c3.json b/samples/cartridges/kubernetes/c3.json
index 59a6388..1f61214 100755
--- a/samples/cartridges/kubernetes/c3.json
+++ b/samples/cartridges/kubernetes/c3.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/kubernetes/c4.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/kubernetes/c4.json b/samples/cartridges/kubernetes/c4.json
index 2032f67..af5343c 100755
--- a/samples/cartridges/kubernetes/c4.json
+++ b/samples/cartridges/kubernetes/c4.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/c1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/c1.json b/samples/cartridges/mock/c1.json
index c60737d..6151024 100755
--- a/samples/cartridges/mock/c1.json
+++ b/samples/cartridges/mock/c1.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/c2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/c2.json b/samples/cartridges/mock/c2.json
index 76dfd4b..eb47ada 100755
--- a/samples/cartridges/mock/c2.json
+++ b/samples/cartridges/mock/c2.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/c3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/c3.json b/samples/cartridges/mock/c3.json
index 59a6388..1f61214 100755
--- a/samples/cartridges/mock/c3.json
+++ b/samples/cartridges/mock/c3.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/c4.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/c4.json b/samples/cartridges/mock/c4.json
index 2032f67..af5343c 100755
--- a/samples/cartridges/mock/c4.json
+++ b/samples/cartridges/mock/c4.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/esb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/esb.json b/samples/cartridges/mock/esb.json
index 14c36c2..db6fe5b 100755
--- a/samples/cartridges/mock/esb.json
+++ b/samples/cartridges/mock/esb.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/mysql.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/mysql.json b/samples/cartridges/mock/mysql.json
index 2b01f6f..2afdf3c 100755
--- a/samples/cartridges/mock/mysql.json
+++ b/samples/cartridges/mock/mysql.json
@@ -26,7 +26,7 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
+
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/php.json b/samples/cartridges/mock/php.json
index f3d831e..08ea098 100755
--- a/samples/cartridges/mock/php.json
+++ b/samples/cartridges/mock/php.json
@@ -31,7 +31,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/stratos-lb.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/stratos-lb.json b/samples/cartridges/mock/stratos-lb.json
index acee6cd..c052fd9 100755
--- a/samples/cartridges/mock/stratos-lb.json
+++ b/samples/cartridges/mock/stratos-lb.json
@@ -20,7 +20,6 @@
{
"type": "mock",
"imageId": "image1",
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/tomcat.json b/samples/cartridges/mock/tomcat.json
index 89461c3..44e9310 100755
--- a/samples/cartridges/mock/tomcat.json
+++ b/samples/cartridges/mock/tomcat.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/tomcat1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/tomcat1.json b/samples/cartridges/mock/tomcat1.json
index 3b9df2c..7fd5865 100755
--- a/samples/cartridges/mock/tomcat1.json
+++ b/samples/cartridges/mock/tomcat1.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/mock/tomcat2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/tomcat2.json b/samples/cartridges/mock/tomcat2.json
index 83e589d..9ac2977 100755
--- a/samples/cartridges/mock/tomcat2.json
+++ b/samples/cartridges/mock/tomcat2.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/openstack/c1.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/c1.json b/samples/cartridges/openstack/c1.json
index 2c78276..c94cb22 100755
--- a/samples/cartridges/openstack/c1.json
+++ b/samples/cartridges/openstack/c1.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/openstack/c2.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/c2.json b/samples/cartridges/openstack/c2.json
index 8b98f2e..13d1887 100755
--- a/samples/cartridges/openstack/c2.json
+++ b/samples/cartridges/openstack/c2.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/openstack/c3.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/c3.json b/samples/cartridges/openstack/c3.json
index 96d8b0f..685589b 100755
--- a/samples/cartridges/openstack/c3.json
+++ b/samples/cartridges/openstack/c3.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/openstack/c4.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/c4.json b/samples/cartridges/openstack/c4.json
index b6af266..8fdfad8 100755
--- a/samples/cartridges/openstack/c4.json
+++ b/samples/cartridges/openstack/c4.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/samples/cartridges/openstack/php.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/openstack/php.json b/samples/cartridges/openstack/php.json
index 2957366..98eb3f0 100755
--- a/samples/cartridges/openstack/php.json
+++ b/samples/cartridges/openstack/php.json
@@ -26,7 +26,6 @@
"networkUuid": "b55f009a-1cc6-4b17-924f-4ae0ee18db5e"
}
],
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
index 45985d9..97624e3 100755
--- a/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/ec2/php-cart.json
@@ -24,7 +24,6 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
"property": [
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json b/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
index cbfab11..a687be3 100755
--- a/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
+++ b/tools/automation-scripts/grouping-automation-script/m1-samples/os/php-cart.json
@@ -24,7 +24,6 @@
{
"type": "openstack",
"imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
- "maxInstanceLimit": "2",
"property": [
{
"name": "instanceType",
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
index 0197ab1..e8227c8 100755
--- a/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/mytest.json
@@ -18,9 +18,8 @@
"iaasProvider": [
{
"type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "property": [
]
}
],
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
index 45985d9..97624e3 100755
--- a/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/php-cart.json
@@ -24,7 +24,6 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
"property": [
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
index 308b94e..1fe1290 100755
--- a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat.json
@@ -19,7 +19,6 @@
{
"type": "ec2",
"imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
"property": [
]
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
index 0984fb9..bb8217a 100755
--- a/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
+++ b/tools/automation-scripts/grouping-automation-script/samples/ec2/tomcat1.json
@@ -18,9 +18,8 @@
"iaasProvider": [
{
"type": "ec2",
- "imageId": "ap-southeast-1/ami-3c0f5d6e",
- "maxInstanceLimit": "2",
- "property": [
+ "imageId": "ap-southeast-1/ami-3c0f5d6e",
+ "property": [
]
}
],
http://git-wip-us.apache.org/repos/asf/stratos/blob/a9b2cff6/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
----------------------------------------------------------------------
diff --git a/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json b/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
index cbfab11..228feb3 100755
--- a/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
+++ b/tools/automation-scripts/grouping-automation-script/samples/os/php-cart.json
@@ -23,9 +23,8 @@
"iaasProvider": [
{
"type": "openstack",
- "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
- "maxInstanceLimit": "2",
- "property": [
+ "imageId": "RegionOne/f2ddf72a-4e76-4893-a9fa-e5f4352f1a86",
+ "property": [
{
"name": "instanceType",
"value": "RegionOne/3"