Fixes to address comments. Part 1
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a0b6a559 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a0b6a559 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a0b6a559 Branch: refs/heads/master Commit: a0b6a5591c4329b030fc520b6ce1c2663257fa8b Parents: ee4c253 Author: Amanda Moran <[email protected]> Authored: Thu Jan 21 20:34:08 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Thu Jan 21 20:34:08 2016 +0000 ---------------------------------------------------------------------- install/installer/cloud_cli_setup | 3 +-- install/installer/dcs_installer | 7 +++++-- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b6a559/install/installer/cloud_cli_setup ---------------------------------------------------------------------- diff --git a/install/installer/cloud_cli_setup b/install/installer/cloud_cli_setup index 980c61e..aac0cd3 100755 --- a/install/installer/cloud_cli_setup +++ b/install/installer/cloud_cli_setup @@ -27,8 +27,7 @@ TRAF_CONFIG=/etc/trafodion/trafodion_config source $TRAF_CONFIG if [ $node_count -eq 1 ]; then - TRAF_PDSH="" - TRAF_PDCP="/bin/cp" + exit 0 else TRAF_PDSH="pdsh $MY_NODES" TRAF_PDCP="pdcp -r $MY_NODES" http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a0b6a559/install/installer/dcs_installer ---------------------------------------------------------------------- diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer index 1f873c8..c959b16 100755 --- a/install/installer/dcs_installer +++ b/install/installer/dcs_installer @@ -194,6 +194,7 @@ echo $DCS_PRIMARY_MASTER_NODE > $DCS_DIR/conf/master if [[ "$ENABLE_HA" == "true" ]]; then + ######Configure dcs-site.xml file rm dcs-site.temp 2>/dev/null cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.master.floating.ip</name>\n <value>true</value>\n </property>\n</configuration>@" > dcs-site.temp cp dcs-site.temp dcs-site.xml @@ -208,7 +209,8 @@ if [[ "$ENABLE_HA" == "true" ]]; then cat dcs-site.xml | sed -e "s@</configuration>@ <property>\n <name>dcs.master.floating.ip.external.ip.address</name>\n <value>$FLOATING_IP</value>\n </property>\n</configuration>@" > dcs-site.temp cp dcs-site.temp dcs-site.xml rm dcs-site.temp 2>/dev/null - + + ######Configure the backup masters file echo "***INFO: modifying $DCS_DIR/conf/backup-masters file" for node in $BACKUP_DCS_NODES @@ -223,7 +225,8 @@ if [[ "$ENABLE_HA" == "true" ]]; then else ######Configure trafci wrapper script - sed -i -e "s/HNAME=localhost:23400/HNAME=$DCS_PRIMARY_MASTER_NODE:23400/g" $SQ_ROOT/trafci/bin/trafci + newHName="HNAME=$DCS_PRIMARY_MASTER_NODE:23400" + sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci fi
