You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by ar...@apache.org on 2015/12/15 19:50:57 UTC
[6/8] incubator-trafodion git commit: Fixes from comments
Fixes from comments
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/eaaeb331
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/eaaeb331
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/eaaeb331
Branch: refs/heads/master
Commit: eaaeb3317cd3a78ff63dded706d59883a15a4883
Parents: e2d04fb
Author: Amanda Moran <am...@apache.com>
Authored: Fri Dec 11 20:03:55 2015 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Fri Dec 11 20:03:55 2015 +0000
----------------------------------------------------------------------
install/installer/dcs_installer | 2 +-
install/installer/traf_config_setup | 8 ++++----
install/installer/trafodion_config_default | 2 ++
3 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/dcs_installer
----------------------------------------------------------------------
diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer
index aea2b7b..2e4d825 100755
--- a/install/installer/dcs_installer
+++ b/install/installer/dcs_installer
@@ -146,7 +146,7 @@ echo "***INFO: untarring build file $DCS_BUILD_FILE"
tar -xzf $DCS_BUILD_FILE
# get the dcs install directory name which is imbedded in the tar file
-DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep LICENSE | sed -e "s@\(^.*\)/LICENSE.txt@\1@")
+DCS_DIR=$(tar -tf $DCS_BUILD_FILE | grep --max-count=1 bin | sed -e "s@\(^.*\)/bin/@\1@"")
DCS_DIR=$DCS_INSTALL_PATH/$DCS_DIR
# set env var in sqenvcom.sh for DCS install directory
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/traf_config_setup
----------------------------------------------------------------------
diff --git a/install/installer/traf_config_setup b/install/installer/traf_config_setup
index 23ded39..a00eb6b 100755
--- a/install/installer/traf_config_setup
+++ b/install/installer/traf_config_setup
@@ -474,7 +474,7 @@ echo "export DCS_SERVERS_PARM=\"$DCS_SERVERS_PARM\"" >> $LOCAL_TRAF_CONFIG
#==============================================
#Enable HA
-echo -n "Enable High Avalability (Y/N), default is N: "
+echo -n "Enable High Availability (Y/N), default is N: "
read answer
if [[ ! -z $answer ]]; then
@@ -498,7 +498,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [ -z $answer ]; then
if [[ -z $FLOATING_IP ]]; then
echo "***ERROR: Floating IP address not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will continue but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
@@ -519,7 +519,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [ -z $answer ]; then
if [[ -z $INTERFACE ]]; then
echo "***ERROR: Floating IP interface was not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will contiune but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
@@ -539,7 +539,7 @@ if [[ "$ENABLE_HA" == "true" ]]; then
if [[ -z "$answer" ]]; then
if [[ -z "$BACKUP_DCS_NODES" ]]; then
echo "***ERROR: Backup DCS Nodes not given."
- echo "***ERROR: Install will contiune but WITHOUT High Avalability"
+ echo "***ERROR: Install will contiune but WITHOUT High Availability"
echo "***ERROR: HA can be configured later, or kill this script and start over."
sed -i '/ENABLE_HA\=/d' $LOCAL_TRAF_CONFIG
echo "export ENABLE_HA=\"false\"" >> $LOCAL_TRAF_CONFIG
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/eaaeb331/install/installer/trafodion_config_default
----------------------------------------------------------------------
diff --git a/install/installer/trafodion_config_default b/install/installer/trafodion_config_default
index d5554bb..6dd2b52 100755
--- a/install/installer/trafodion_config_default
+++ b/install/installer/trafodion_config_default
@@ -152,3 +152,5 @@ export FLOATING_IP=""
#If HA enabled the set the DCS Backup nodes
export BACKUP_DCS_NODES=""
+#If HA enabled then set INTERFACE to match the interface of the floating ip
+export INTERFACE=""