Fixed issues seen during testing
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/c2ce702e Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c2ce702e Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c2ce702e Branch: refs/heads/master Commit: c2ce702e22f63b05ca59fb609803e0339e7c5de7 Parents: d5e3e84 Author: Anuradha Hegde <[email protected]> Authored: Wed Jan 6 23:53:44 2016 +0000 Committer: Anuradha Hegde <[email protected]> Committed: Wed Jan 6 23:53:44 2016 +0000 ---------------------------------------------------------------------- install/installer/cloud_cli_setup | 18 +++++++++--------- install/installer/trafodion_install | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c2ce702e/install/installer/cloud_cli_setup ---------------------------------------------------------------------- diff --git a/install/installer/cloud_cli_setup b/install/installer/cloud_cli_setup index b58788c..1edd479 100755 --- a/install/installer/cloud_cli_setup +++ b/install/installer/cloud_cli_setup @@ -30,34 +30,34 @@ if [ $node_count -eq 1 ]; then TRAF_PDSH="" TRAF_PDCP="" else - TRAF_PDSH="pdsh -R exec $MY_NODES $PDSH_SSH_CMD" + TRAF_PDSH="pdsh $MY_NODES" TRAF_PDCP="pdcp -R ssh $MY_NODES" fi ###### Setting up CLI for AWS as sudo id if [[ ! -z $AWS_CLOUD ]]; then ###### Check if aws configuration file exist for Trafodion Id - AWSCONFIG_DIR=$(sudo su $TRAF_USER --login --command "$(/bin/ls -d $HOME/.aws)" 2>/dev/null) - if [[ -z $AWSCONFIG_DIR ]]; then + AWSCONFIG_DIR=`sudo su $TRAF_USER --login --command "ls -altr | grep -w ".aws" | wc -l" ` + if [[ $AWSCONFIG_DIR == 0 ]]; then cd $HOME curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip"; -o "awscli-bundle.zip" unzip $HOME/awscli-bundle.zip if [[ $node_count -gt "1" ]]; then - $TRAF_PDCP $HOME/awscli-bundle $HOME - $TRAF_PDSH sudo $HOME/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws + $TRAF_PDCP -r $HOME/awscli-bundle $HOME + $TRAF_PDSH "sudo $HOME/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws" | tee -a $INSTALL_LOG else - $HOME/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws + $HOME/awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws | tee -a $INSTALL_LOG fi - $TRAF_PDSH sudo rm -rf $HOME/awscli-bundle + $TRAF_PDSH "sudo rm -rf $HOME/awscli-bundle" rm -f $HOME/awscli-bundle.zip ###### Execute 'aws configure' command as a Trafodion Id sudo su $TRAF_USER --login --command "/usr/local/bin/aws configure" ###### Copy the .aws folder to all nodes in the cluster for Trafodion Id - sudo su $TRAF_USER --login --command "$TRAF_PDCP $HOME/.aws $HOME" + sudo su $TRAF_USER --login --command "$TRAF_PDCP -r $HOME_DIR/$TRAF_USER/.aws $HOME_DIR/$TRAF_USER" else echo "AWS Configuration already exist for Trafodion Id" echo -n "Do you want to overwrite the configuration (Y/N), default is N: " @@ -68,7 +68,7 @@ if [[ ! -z $AWS_CLOUD ]]; then sudo su $TRAF_USER --login --command "/usr/local/bin/aws configure" ###### Copy the .aws folder to all nodes in the cluster for Trafodion Id - sudo su $TRAF_USER --login --command "$TRAF_PDCP $HOME/.aws $HOME" + sudo su $TRAF_USER --login --command "$TRAF_PDCP -r $HOME_DIR/$TRAF_USER/.aws $HOME_DIR/$TRAF_USER" fi fi fi http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c2ce702e/install/installer/trafodion_install ---------------------------------------------------------------------- diff --git a/install/installer/trafodion_install b/install/installer/trafodion_install index 3567a5e..5dd1426 100755 --- a/install/installer/trafodion_install +++ b/install/installer/trafodion_install @@ -784,7 +784,7 @@ fi # Install and configure CLI for Cloud environments if [ "$ENABLE_HA" == "true" ] && [ $CLOUD_CONFIG == "Y" ]; then - echo "Install and configure CLI for Cloud ($CLOUD_TYPE)" + echo "***INFO: Install and configure CLI for Cloud" $TRAF_WORKDIR/installer/cloud_cli_setup fi
