fixed issued
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/4e30bf08 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/4e30bf08 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/4e30bf08 Branch: refs/heads/master Commit: 4e30bf08e0d88106f5b6ccf29652d65ec8b966c9 Parents: c2ce702 Author: Anuradha Hegde <[email protected]> Authored: Thu Jan 7 00:42:04 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Thu Jan 7 00:42:04 2016 +0000 ---------------------------------------------------------------------- install/installer/dcs_installer | 16 ++++++---------- install/installer/trafodion_install | 2 +- 2 files changed, 7 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4e30bf08/install/installer/dcs_installer ---------------------------------------------------------------------- diff --git a/install/installer/dcs_installer b/install/installer/dcs_installer index 67cc72c..2e9994e 100755 --- a/install/installer/dcs_installer +++ b/install/installer/dcs_installer @@ -225,22 +225,18 @@ if [[ "$ENABLE_HA" == "true" ]]; then sed -i -e "s/HNAME=localhost:23400/$newHName/g" $SQ_ROOT/trafci/bin/trafci ######Copy HA configuration to all nodes in the cluster - if [[ $node_count -gt 1 ]]; then - $TRAF_PDCP $DCS_DIR/conf/dcs-site.xml $DCS_DIR/conf/dcs-site.xml - $TRAF_PDCP $DCS_DIR/conf/backup-masters $DCS_DIR/conf/backup-masters - fi + #Following lines are being copied by the caller script. Will remove these lines later + #if [[ $node_count -gt 1 ]]; then + # $TRAF_PDCP $DCS_DIR/conf/dcs-site.xml $DCS_DIR/conf/dcs-site.xml + # $TRAF_PDCP $DCS_DIR/conf/backup-masters $DCS_DIR/conf/backup-masters + # $TRAF_PDCP $SQ_ROOT/trafci/bin/trafci $SQ_ROOT/trafci/bin/trafci + #fi else ######Configure trafci wrapper script sed -i -e "s/HNAME=localhost:23400/$DCS_PRIMARY_MASTER_NODE:23400/g" $SQ_ROOT/trafci/bin/trafci fi -###### Copy trafci to all nodes in the cluster -if [[ $node_count -gt 1 ]]; then - $TRAF_PDCP $SQ_ROOT/trafci/bin/trafci $SQ_ROOT/trafci/bin/trafci -fi - - echo "***INFO: creating $DCS_DIR/conf/servers file" rm servers 2>/dev/null let per_node=$DCS_SERVER_COUNT/$node_count http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/4e30bf08/install/installer/trafodion_install ---------------------------------------------------------------------- diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install index 5dd1426..54ad7c8 100755 --- a/install/installer/trafodion_install +++ b/install/installer/trafodion_install @@ -783,7 +783,7 @@ if [ ${PIPESTATUS[0]} != "0" ]; then fi # Install and configure CLI for Cloud environments -if [ "$ENABLE_HA" == "true" ] && [ $CLOUD_CONFIG == "Y" ]; then +if [ "$ENABLE_HA" == "true" ] && [[ $CLOUD_CONFIG == "Y" ]]; then echo "***INFO: Install and configure CLI for Cloud" $TRAF_WORKDIR/installer/cloud_cli_setup fi
