hard coded values for check_healthcheck_ok function

[pierrepgithub]

The below function has hard coded values for the OHS instance name which results in errors on this step during OAM deployment

check_healthcheck_ok()
{
   ST=$(date +%s)
   print_msg "Checking Health-check is not blocked"

   printf "\n\t\t\t$OHS_HOST1 - "
   blocked_ip=$( $SSH ${OHS_USER}@$OHS_HOST1 grep health-check.html  $OHS_DOMAIN/servers/ohs?/logs/access_log | grep 403 | awk '{ print $1 }' | tail -1 )
   if [ "$blocked_ip" = "" ]
   then
     echo "Success"
   else
     printf "Blocked by IP Address: $blocked_ip - Fixing - "
     $SSH ${OHS_USER}@$OHS_HOST1 -C sed -i \"/    require host/a "\\    require ip $blocked_ip"\" $OHS_DOMAIN/config/fmwconfig/components/OHS/ohs?/webgate.conf
     print_status $?
     printf "\t\t\tRestarting OHS $OHS_HOST1 - "
     $SSH ${OHS_USER}@$OHS_HOST1 "$OHS_DOMAIN/bin/restartComponent.sh $OHS1_NAME" > $LOGDIR/restart_$OHS_HOST1.log 2>&1
     print_status $? $LOGDIR/restart_$OHS_HOST1.log
   fi

   if [ ! "$OHS_HOST2" = "" ]
   then
     printf "\n\t\t\t$OHS_HOST2 - "
     blocked_ip=$( $SSH ${OHS_USER}@$OHS_HOST2 grep health-check.html  $OHS_DOMAIN/servers/ohs?/logs/access_log | grep 403 | awk '{ print $1 }' | tail -1 )
     if [ "$blocked_ip" = "" ]
     then
       echo "Success"
     else
       printf "Blocked by IP Address: $blocked_ip - Fixing - "
       $SSH ${OHS_USER}@$OHS_HOST2 -C sed -i \"/    require host/a "\\    require ip $blocked_ip"\" $OHS_DOMAIN/config/fmwconfig/components/OHS/ohs?/webgate.conf
       print_status $?
       printf "\t\t\tRestarting OHS $OHS_HOST2 - "
       $SSH ${OHS_USER}@$OHS_HOST2 "$OHS_DOMAIN/bin/restartComponent.sh $OHS2_NAME" > $LOGDIR/restart_$OHS_HOST2.log 2>&1
       print_status $? $LOGDIR/restart_$OHS_HOST2.log
     fi
   fi
}

[solanki-chetan]

I see that every where $OHS_HOST2 or $OHS_HOST1 etc. can you please point out a particular instance?

[sumangongali]

the scripts are created based on EDG setup assumption with default name "ohs"

the name "ohs" needs to be parameterised. OHS/ohs?.

it can be any other name apart from ohs?

$OHS_DOMAIN/config/fmwconfig/components/OHS/ohs?/webgate.conf