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/09/12 13:34:13 UTC
git commit: Update tools/stratos-installer/conf/setup.conf to support
multiple nodes Update tools/stratos-installer/setup.sh validation part
Updated Branches:
refs/heads/master 3d5b25f46 -> 6da65aeba
Update tools/stratos-installer/conf/setup.conf to support multiple nodes
Update tools/stratos-installer/setup.sh validation part
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/6da65aeb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/6da65aeb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/6da65aeb
Branch: refs/heads/master
Commit: 6da65aeba150712d124d8c5136b3a68e0826e63e
Parents: 3d5b25f
Author: Manula Thantriwatte <ma...@wso2.com>
Authored: Thu Sep 12 17:02:38 2013 +0530
Committer: Manula Thantriwatte <ma...@wso2.com>
Committed: Thu Sep 12 17:02:38 2013 +0530
----------------------------------------------------------------------
tools/stratos-installer/conf/setup.conf | 6 ++----
tools/stratos-installer/setup.sh | 17 +++++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6da65aeb/tools/stratos-installer/conf/setup.conf
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/conf/setup.conf b/tools/stratos-installer/conf/setup.conf
index f7a9bb7..a3277f5 100644
--- a/tools/stratos-installer/conf/setup.conf
+++ b/tools/stratos-installer/conf/setup.conf
@@ -40,8 +40,6 @@ export JAVA_HOME= #Java home path
export log_path=/var/log/apache-stratos
export hostip="ip" #Machine ip on which setup script run
-export elb_hostip="ip" #Machine ip on which elb run
-export agent_hostip="ip" #Machine ip on which agent run
export host_user="" #A host user account for stratos. If not provided deafult is assumed stratos. If no account #named stratos exist it will be created.
export mysql_connector_jar=$stratos_pack_path/"mysql-connector-java-5.1.25.jar" #mysql connector jar file name
export stratos_domain="stratos.apache.org"
@@ -76,10 +74,10 @@ export sc_https_port="9445"
export sc_http_port="9765"
export sc_port_offset=2
export sc_hostname="$stratos_domain"
-export elb_ip=$elb_hostip
+export elb_ip="elb ip" #Machine ip on which elb run
export cassandra_port="9163"
export sc_ip=$hostip
-export agent_ip=$agent_hostip
+export agent_ip="agent ip" #Machine ip on which agent run
export keypair_path="<keypair_path>"
# Git repo cofiguration. This will be needed only if you need to setup an internal git repo.
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/6da65aeb/tools/stratos-installer/setup.sh
----------------------------------------------------------------------
diff --git a/tools/stratos-installer/setup.sh b/tools/stratos-installer/setup.sh
index 6dab891..58bfac0 100755
--- a/tools/stratos-installer/setup.sh
+++ b/tools/stratos-installer/setup.sh
@@ -175,6 +175,23 @@ function setup_validate {
fi
fi
+ if [[ ( -z $elb_ip ) ]]; then
+ elb_ip=$(ifconfig eth0| sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')
+ if [[ ( -z elb_ip ) ]]; then
+ helpsetup
+ exit 1
+ fi
+ fi
+
+ if [[ ( -z $agent_ip ) ]]; then
+ agent_ip=$(ifconfig eth0| sed -En 's/127.0.0.1//;s/.*inet (addr:)?(([0-9]*\.){3}[0-9]*).*/\2/p')
+ if [[ ( -z $agent_ip ) ]]; then
+ helpsetup
+ exit 1
+ fi
+ fi
+
+
if [[ -z $git_ip ]]; then
git_ip=$hostip
fi