You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2013/12/17 12:38:03 UTC
[4/4] git commit: Remove lb related configurations
Remove lb related configurations
Signed-off-by: Manula Thantriwatte <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/8c20289e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/8c20289e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/8c20289e
Branch: refs/heads/master
Commit: 8c20289e7c7c40f0e02b069c2e88982d47ffbc17
Parents: baba9d2
Author: Dinesh Bandara <di...@wso2.com>
Authored: Tue Dec 17 14:33:55 2013 +0530
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Tue Dec 17 17:06:29 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/conf/setup.conf | 14 +---
.../repository/conf/cartridge-config.properties | 8 +-
tools/stratos-installer/setup.sh | 77 ++------------------
tools/stratos-installer/start-servers.sh | 19 +----
4 files changed, 16 insertions(+), 102 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index 5280294..630dec3 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -61,7 +61,6 @@ export mb_hostname="mb.$stratos_domain"
export cep_hostname="cep.$stratos_domain"
export sm_hostname="$stratos_domain"
export cc_hostname="cc.$stratos_domain"
-export lb_hostname="lb.$stratos_domain"
export as_hostname="as.$stratos_domain"
export resource_path=$setup_path/resources
@@ -89,18 +88,6 @@ export cep_mb_listen_port=$((5672 + $mb_port_offset))
# ----------------------------------------------------------------------------
-# LB configuration
-# ----------------------------------------------------------------------------
-export lb_path=$stratos_path/"apache-stratos-load-balancer-4.0.0-SNAPSHOT"
-export lb_pack_path=$stratos_pack_path/"apache-stratos-load-balancer-4.0.0-SNAPSHOT.zip"
-
-export lb_mb_ip=$mb_ip
-export lb_mb_listen_port=$((5672 + $mb_port_offset))
-export lb_cep_ip=$cep_ip
-export lb_cep_tcp_port=$((7611 + $cep_port_offset))
-
-
-# ----------------------------------------------------------------------------
# CC configuration
# ----------------------------------------------------------------------------
export cc_path=$stratos_path/"apache-stratos-cc-4.0.0-SNAPSHOT"
@@ -179,6 +166,7 @@ export stratos_foundation_db_pass="mysql"
export sm_mb_listen_port=$((5672 + $mb_port_offset))
export sm_cc_https_port=$((9443 + $cc_port_offset))
+export sm_as_https_port=$((9443 + $as_port_offset))
export sm_https_port=$((9443 + $sm_port_offset))
export sm_http_port=$((9763 + $sm_port_offset))
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
index 398c2da..37f1f59 100644
--- a/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
+++ b/tools/stratos-installer/config/sm/repository/conf/cartridge-config.properties
@@ -23,13 +23,15 @@
sc.ip=SC_IP
autoscalerService.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/
+autoscaler.service.url=https://AS_HOSTNAME:AS_HTTPS_PORT/services/AutoScalerService/
+cloud.controller.service.url=https://CC_HOSTNAME:CC_HTTPS_PORT/services/CloudControllerService/
autoscaler.time.out=190000
cartridge.agent.epr=https://AGENT_HOSTNAME:AGENT_PORT/services/CartridgeAgentService
git.host.name=git.STRATOS_DOMAIN
git.host.ip=GIT_IP
-git.repo.notification.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotificationService/
-identity.server.url=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepoNotificationService/
-repository.info.epr=https://SC_HOSTNAME:SC_HTTPS_PORT/services/RepositoryInformationService
+git.repo.notification.url=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepoNotificationService/
+identity.server.url=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepoNotificationService/
+repository.info.epr=https://SM_HOSTNAME:SM_HTTPS_PORT/services/RepositoryInformationService
adc.jdbc.url=jdbc:mysql://STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT/STRATOS_FOUNDATION_DB_SCHEMA
adc.jdbc.username=STRATOS_FOUNDATION_DB_USER
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 2e9b3f5..dee666a 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -37,21 +37,21 @@ lb="false"
as="false"
sm="false"
cep="false"
-product_list="mb;cc;cep;lb;as;sm"
+product_list="mb;cc;cep;as;sm"
enable_internal_git=false
function help {
echo ""
echo "Usage:"
echo "setup.sh -u <host username> -p \"<product list>\""
- echo "product list : [mb, cc, lb, as, sm, cep]"
+ echo "product list : [mb, cc, as, sm, cep]"
echo "Example:"
- echo "sudo ./setup.sh -p \"cc lb\""
+ echo "sudo ./setup.sh -p \"cc\""
echo "sudo ./setup.sh -p \"all\""
echo ""
echo "-u: <host username> The login user of the host."
echo "-p: <product list> Apache Stratos products to be installed on this node. Provide one or more names of the servers."
- echo " The available servers are cc, lb, as, sm or all. 'all' means you need to setup all servers in this machine. Default is all"
+ echo " The available servers are cc, as, sm or all. 'all' means you need to setup all servers in this machine. Default is all"
echo "-g: <enable_internal_git> true|false Whether enable internal git repo for Stratos2. Default is false"
echo ""
}
@@ -86,9 +86,6 @@ do
if [[ $x = "cep" ]]; then
cep="true"
fi
- if [[ $x = "lb" ]]; then
- lb="true"
- fi
if [[ $x = "as" ]]; then
as="true"
fi
@@ -99,7 +96,6 @@ do
mb="true"
cep="true"
cc="true"
- lb="true"
as="true"
sm="true"
fi
@@ -193,20 +189,6 @@ function cep_conf_validate {
fi
}
-function lb_conf_validate {
- if [[ -z $lb_path ]]; then
- helpsetup LB
- exit 1
- fi
- if [[ -z $lb_cep_ip ]]; then
- echo "Please specify the ip of CEP in conf/setup.conf"
- exit 1
- elif !(valid_ip $lb_cep_ip); then
- echo "Please provide valid ip for CEP's ip"
- exit 1
- fi
-}
-
function cc_conf_validate {
if [[ (-z $cc_path || -z $cc_port_offset) ]]; then
helpsetup CC
@@ -274,9 +256,6 @@ fi
if [[ $cep = "true" ]]; then
cep_conf_validate
fi
-if [[ $lb = "true" ]]; then
- lb_conf_validate
-fi
if [[ $cc = "true" ]]; then
cc_conf_validate
fi
@@ -315,11 +294,6 @@ if [[ $cep = "true" ]]; then
unzip $cep_pack_path -d $stratos_path
fi
fi
-if [[ $lb = "true" ]]; then
- if [[ ! -d $lb_path ]]; then
- unzip $lb_pack_path -d $stratos_path
- fi
-fi
if [[ $cc = "true" ]]; then
if [[ ! -d $cc_path ]]; then
unzip $cc_pack_path -d $stratos_path
@@ -401,38 +375,6 @@ if [[ $cep = "true" ]]; then
cep_setup
fi
-# ------------------------------------------------
-# Setup LB
-# ------------------------------------------------
-function lb_setup {
- echo "Setup LB" >> $LOG
- echo "Configuring the Load Balancer"
-
- cp -f ./config/lb/repository/conf/loadbalancer.conf $lb_path/repository/conf/
- cp -f ./config/lb/repository/conf/axis2/axis2.xml $lb_path/repository/conf/axis2/
-
- pushd $lb_path
-
- echo "In repository/conf/loadbalancer.conf" >> $LOG
- cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
- cat repository/conf/loadbalancer.conf.orig | sed -e "s@MB_IP@$lb_mb_ip@g" > repository/conf/loadbalancer.conf
-
- cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
- cat repository/conf/loadbalancer.conf.orig | sed -e "s@MB_LISTEN_PORT@$lb_mb_listen_port@g" > repository/conf/loadbalancer.conf
-
- cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
- cat repository/conf/loadbalancer.conf.orig | sed -e "s@CEP_IP@$lb_cep_ip@g" > repository/conf/loadbalancer.conf
-
- cp -f repository/conf/loadbalancer.conf repository/conf/loadbalancer.conf.orig
- cat repository/conf/loadbalancer.conf.orig | sed -e "s@CEP_LISTEN_PORT@$lb_cep_tcp_port@g" > repository/conf/loadbalancer.conf
-
- popd #lb_path
- echo "End configuring the Load Balancer"
-}
-
-if [[ $lb = "true" ]]; then
- lb_setup
-fi
# ------------------------------------------------
# Setup CC
@@ -538,10 +480,13 @@ function sm_setup {
cat repository/conf/cartridge-config.properties.orig | sed -e "s@CC_HOSTNAME:CC_HTTPS_PORT@$cc_hostname:$sm_cc_https_port@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@AS_HOSTNAME:AS_HTTPS_PORT@$as_hostname:$sm_as_https_port@g" > repository/conf/cartridge-config.properties
+
+ cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_DOMAIN@$stratos_domain@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
- cat repository/conf/cartridge-config.properties.orig | sed -e "s@SC_HOSTNAME:SC_HTTPS_PORT@$sm_ip:$sm_https_port@g" > repository/conf/cartridge-config.properties
+ cat repository/conf/cartridge-config.properties.orig | sed -e "s@SM_HOSTNAME:SM_HTTPS_PORT@$sm_ip:$sm_https_port@g" > repository/conf/cartridge-config.properties
cp -f repository/conf/cartridge-config.properties repository/conf/cartridge-config.properties.orig
cat repository/conf/cartridge-config.properties.orig | sed -e "s@STRATOS_FOUNDATION_DB_HOSTNAME:STRATOS_FOUNDATION_DB_PORT@$stratos_foundation_db_hostname:$stratos_foundation_db_port@g" > repository/conf/cartridge-config.properties
@@ -610,10 +555,6 @@ cp -f /etc/hosts hosts.tmp
echo "$mb_ip $mb_hostname # message broker hostname" >> hosts.tmp
-if [[ $lb = "true" ]]; then
- echo "$lb_cep_ip $cep_hostname # load balancer hostname" >> hosts.tmp
-fi
-
if [[ $sm = "true" ]]; then
echo "$sm_ip $sm_hostname # stratos domain" >> hosts.tmp
echo "$cc_ip $cc_hostname # cloud controller hostname" >> hosts.tmp
@@ -627,8 +568,6 @@ mv -f ./hosts.tmp /etc/hosts
# Starting the servers
# ------------------------------------------------
echo "Starting the servers" >> $LOG
-#Starting the servers in the following order is recommended
-#mb, cc, elb, is, agent, sm
echo "Starting up servers. This may take time. Look at $LOG file for server startup details"
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8c20289e/tools/stratos-installer/start-servers.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/start-servers.sh b/tools/stratos-installer/start-servers.sh
index 414b8ab..2921381 100755
--- a/tools/stratos-installer/start-servers.sh
+++ b/tools/stratos-installer/start-servers.sh
@@ -36,11 +36,11 @@ fi
function help {
echo ""
echo "Give one or more of the servers to start on this machine. The available servers are"
- echo "mb, cc, lb, as, sc, cep, all. 'all' means you need to start all servers."
+ echo "mb, cc, as, sm, cep, all. 'all' means you need to start all servers."
echo "usage:"
echo "setup.sh -p\"<product list>\""
echo "eg."
- echo "setup.sh -p\"cc lb\""
+ echo "setup.sh -p\"cc sm\""
echo ""
}
@@ -70,9 +70,6 @@ do
if [[ $x = "cc" ]]; then
cc="true"
fi
- if [[ $x = "lb" ]]; then
- lb="true"
- fi
if [[ $x = "as" ]]; then
as="true"
fi
@@ -82,7 +79,6 @@ do
if [[ $x = "all" ]]; then
mb="true"
cc="true"
- lb="true"
as="true"
sc="true"
cep="true"
@@ -90,10 +86,8 @@ do
if [[ $x = "demo" ]]; then
demo="true"
cc="true"
- lb="true"
as="true"
sc="true"
- bam="true"
fi
done
product_list=`echo $product_list | sed 's/^ *//g' | sed 's/ *$//g'`
@@ -132,15 +126,6 @@ if [[ $cc = "true" ]]; then
sleep $SLEEP
fi
-if [[ $lb = "true" ]]; then
- echo ${lb_path}
-
- echo "Starting LB server ..." >> $LOG
- nohup ${lb_path}/bin/stratos.sh &
- echo "LB server started" >> $LOG
- sleep $SLEEP
-fi
-
if [[ $as = "true" ]]; then
echo ${as_path}