2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-21 19:22:05 +00:00

export XCATSSLVER=TLSv1 in xcathmc when on the sles11 platform.

change rcons so that if nodehm.conserver is set, the server is the SAME
node, don't pass the -s option to confetty for now.
This commit is contained in:
Victor Hu 2015-07-02 14:18:36 -04:00
parent d4e1383e68
commit 60bcc9e884
2 changed files with 15 additions and 1 deletions

View File

@ -75,8 +75,15 @@ if [ $USE_CONFLUENT == "1" ] && ([ -x "/opt/confluent/bin/confetty" ] || [ -x "/
fi
if [ -z "$CONSERVER" ]; then
CONSERVER=`nodels $1 nodehm.conserver 2>/dev/null | awk -F: '{print $2}' | tr -d ' '`
declare -a ipaddrs=`ip addr | grep 'inet' | awk {'print $2'} | cut -d/ -f1 | grep -v : | tr '\n' ' '`
for IP in ${ipaddrs[*]}; do
if [[ "${CONSERVER}" == "${IP}" ]]; then
# conserver is the same node, do not connect using -s
CONSERVER=""
break
fi
done
fi
if [ -z "$CONSERVER" ]; then
CONSERVER=$XCATHOST
fi

View File

@ -1,2 +1,9 @@
#!/bin/bash
# export XCATSSLVER for SLES 11. Other OS can work without this setting.
if [ -r /etc/SuSE-release ]; then
ver=`grep 'VERSION' /etc/SuSE-release | awk -F= '{print $2}' | sed 's/ //g'`
if [ "$ver" = "11" ]; then
export XCATSSLVER=TLSv1
fi
fi
exec /opt/xcat/share/xcat/cons/hmc $CONFLUENT_NODE