2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 17:23:08 +00:00

Merge pull request #2381 from immarvin/oncumulus

support cumulus os in syslog postscript
This commit is contained in:
tingtli 2017-01-10 15:09:04 +08:00 committed by GitHub
commit 8e2be27748
4 changed files with 23 additions and 0 deletions

View File

@ -25,6 +25,13 @@
#enable debug
#set -x
if cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumulus Linux[ \"']*$" >/dev/null 2>&1 ; then
#TODO
echo "Cumulus OS is not supported yet, nothing to do..."
logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."
exit 0
fi
# pmatch determines if 1st argument string is matched by 2nd argument pattern
pmatch ()

View File

@ -12,6 +12,12 @@
#
# if on the Management Node, exit
if cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumulus Linux[ \"']*$" >/dev/null 2>&1 ; then
#TODO
echo "Cumulus OS is not supported yet, nothing to do..."
logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."
exit 0
fi
if [ "$(uname -s|tr 'A-Z' 'a-z')" = "linux" ];then
str_dir_name=`dirname $0`

View File

@ -7,6 +7,13 @@
#
#####################################################
if cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumulus Linux[ \"']*$" >/dev/null 2>&1 ; then
#TODO
echo "Cumulus OS is not supported yet, nothing to do..."
logger -t xcat -p local4.info "Cumulus OS is not supported yet, nothing to do..."
exit 0
fi
# do nothing when UPDATENODE=1 because it is done from the top down
if [ -n "$UPDATENODE" ] && [ $UPDATENODE -eq 1 ]; then
#echo " Did not sync any files. Use updatenode -F to sync the files."

View File

@ -148,6 +148,9 @@ config_rsyslog_V8()
conf_file="/etc/rsyslog.conf"
remoteconf="/etc/rsyslog.d/remote.conf"
#for Cumulus OS inside ONIE switches
cat /etc/os-release |grep -i -e "^NAME=[ \"']*Cumulus Linux[ \"']*$" >/dev/null 2>&1 && remoteconf="/etc/rsyslog.d/99-syslog.conf"
# If this is a Management Node or Service Node, then it will be receiving syslog entries from the
# compute nodes. Management Node is receiving from Service Nodes and possibly compute nodes.
# They will all be put in /var/log/messages