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/11 09:00:38 UTC
stratos git commit: updating cartridge management in UI
Repository: stratos
Updated Branches:
refs/heads/master e235a8d57 -> 3bd223970
updating cartridge management in UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/3bd22397
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/3bd22397
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/3bd22397
Branch: refs/heads/master
Commit: 3bd2239709b2c97b55d7cdfef3d586889a37a1ee
Parents: e235a8d
Author: R-Rajkumar <rr...@gmail.com>
Authored: Wed Mar 11 13:30:24 2015 +0530
Committer: R-Rajkumar <rr...@gmail.com>
Committed: Wed Mar 11 13:30:24 2015 +0530
----------------------------------------------------------------------
.../forms/default/configure/cartridges.json | 4 ++--
.../forms/schema/configure/cartridges.json | 15 +++++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/3bd22397/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
index 22f2148..070a2ea 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/cartridges.json
@@ -7,8 +7,8 @@
"displayName":"PHP",
"description":"PHP Cartridge",
"version":"7",
- "defaultAutoscalingPolicy":"economyPolicy",
"multiTenant":"false",
+ "loadBalancingIPType": "private",
"portMapping":[
{
"protocol":"http",
@@ -57,4 +57,4 @@
]
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/stratos/blob/3bd22397/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index a3ac159..6f8db89 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -98,13 +98,16 @@
"default": false,
"maxItems": 1
},
- "defaultAutoscalingPolicy": {
+ "loadBalancingIPType": {
"type": "string",
- "id": "root/defaultAutoscalingPolicy",
- "title": "Default Autoscaling Policy",
- "name": "Default Autoscaling Policy",
- "default": "economyPolicy",
- "required": false
+ "id": "root/loadBalancingIPType",
+ "title": "Load Balancing IP Type",
+ "description": "This will use to load balance to either private or public IP of the member",
+ "name": "Load Balancing IP Type",
+ "default": "private",
+ "propertyOrder": 7,
+ "maxItems": 1,
+ "enum": ["private","public"]
},
"portMapping": {
"type": "array",