You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/06/01 08:49:21 UTC
stratos git commit: Update the single cartridge app with tomcat
Repository: stratos
Updated Branches:
refs/heads/lvs_extension 6b3d4ecea -> 04aea8a61
Update the single cartridge app with tomcat
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/04aea8a6
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/04aea8a6
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/04aea8a6
Branch: refs/heads/lvs_extension
Commit: 04aea8a61825f11e6ff417a75c2c9f21bb26aa00
Parents: 6b3d4ec
Author: Gayan Gunarathne <ga...@wso2.com>
Authored: Mon Jun 1 12:18:59 2015 +0530
Committer: Gayan Gunarathne <ga...@wso2.com>
Committed: Mon Jun 1 12:18:59 2015 +0530
----------------------------------------------------------------------
.../stratos/mock/iaas/services/impl/MockIPAddressPool.java | 4 ++--
.../simple/single-cartridge-app/artifacts/application.json | 4 ++--
.../simple/single-cartridge-app/scripts/common/deploy.sh | 2 +-
samples/cartridges/mock/tomcat.json | 5 -----
4 files changed, 5 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/04aea8a6/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIPAddressPool.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIPAddressPool.java b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIPAddressPool.java
index a98a0c2..22f3c2a 100644
--- a/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIPAddressPool.java
+++ b/components/org.apache.stratos.mock.iaas/src/main/java/org/apache/stratos/mock/iaas/services/impl/MockIPAddressPool.java
@@ -37,8 +37,8 @@ public class MockIPAddressPool {
private static final String MOCK_IAAS_PRIVATE_IP_SEQUENCE = "/cloud.controller/mock/iaas/private-ip-sequence";
private static final String MOCK_IAAS_PUBLIC_IP_SEQUENCE = "/cloud.controller/mock/iaas/public-ip-sequence";
- private static final String PRIVATE_IP_PREFIX = "10.0.0.";
- private static final String PUBLIC_IP_PREFIX = "20.0.0.";
+ private static final String PRIVATE_IP_PREFIX = "192.168.55.";
+ private static final String PUBLIC_IP_PREFIX = "192.168.56.";
private static volatile MockIPAddressPool instance;
http://git-wip-us.apache.org/repos/asf/stratos/blob/04aea8a6/samples/applications/simple/single-cartridge-app/artifacts/application.json
----------------------------------------------------------------------
diff --git a/samples/applications/simple/single-cartridge-app/artifacts/application.json b/samples/applications/simple/single-cartridge-app/artifacts/application.json
index c502f2f..d14518f 100644
--- a/samples/applications/simple/single-cartridge-app/artifacts/application.json
+++ b/samples/applications/simple/single-cartridge-app/artifacts/application.json
@@ -5,11 +5,11 @@
"components": {
"cartridges": [
{
- "type": "php",
+ "type": "tomcat",
"cartridgeMin": 2,
"cartridgeMax": 10,
"subscribableInfo": {
- "alias": "my-php",
+ "alias": "my-tomcat",
"autoscalingPolicy": "autoscaling-policy-1",
"deploymentPolicy": "deployment-policy-1",
"artifactRepository": {
http://git-wip-us.apache.org/repos/asf/stratos/blob/04aea8a6/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh
----------------------------------------------------------------------
diff --git a/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh b/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh
index 48564a9..95d38d1 100755
--- a/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh
+++ b/samples/applications/simple/single-cartridge-app/scripts/common/deploy.sh
@@ -54,7 +54,7 @@ echo "Adding deployment policy..."
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 php cartridge..."
-curl -X POST -H "Content-Type: application/json" -d "@${iaas_cartridges_path}/php.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
+curl -X POST -H "Content-Type: application/json" -d "@${iaas_cartridges_path}/tomcat.json" -k -v -u admin:admin https://${host_ip}:${host_port}/api/cartridges
sleep 1
echo "Adding application policy..."
http://git-wip-us.apache.org/repos/asf/stratos/blob/04aea8a6/samples/cartridges/mock/tomcat.json
----------------------------------------------------------------------
diff --git a/samples/cartridges/mock/tomcat.json b/samples/cartridges/mock/tomcat.json
index b352662..28845e1 100755
--- a/samples/cartridges/mock/tomcat.json
+++ b/samples/cartridges/mock/tomcat.json
@@ -10,11 +10,6 @@
"portMapping": [
{
"protocol": "http",
- "port": "22",
- "proxyPort": "8280"
- },
- {
- "protocol": "http",
"port": "8080",
"proxyPort": "80"
}