Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Qmulconfignetwork #7092

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Qmulconfignetwork #7092

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5362c68
Add -r option to confignetwork to remove unconfigured network devices
Jan 7, 2022
84a569a
Merge branch 'xcat2:master' into qmulconfignetwork
ChristopherWalker Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions xCAT/postscripts/confignetwork
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
# updatenode noderange confignetwork
# 3. confignetwork can be used in postscripts or postbootscripts too.
#
# 4. To delete the config files for nics other than the install nic and those with xCAT config, you can run the following command on MN:
# updatenode noderange "confignetwork -r"
#
############################################################################

# load library
Expand Down Expand Up @@ -85,6 +88,7 @@ function get_nic_cfg_file_content {
#
#####################################################################
boot_install_nic=0
remove_nics=0
str_ib_nics=''
num_iba_ports=
for arg in "$@"
Expand All @@ -93,6 +97,8 @@ do
boot_install_nic=1
elif [ "${arg:0:10}" = "--ibaports" ];then
num_iba_ports=${arg#--ibaports=}
elif [ "$arg" = "-r" ]; then
remove_nics=1
fi
done
if [ "$SETINSTALLNIC" = "1" ] || [ "$SETINSTALLNIC" = "yes" ]; then
Expand Down Expand Up @@ -167,6 +173,7 @@ function parser_nic_attribute {
str_all_nics=$str_all_nics"$key "
fi
hashset $nicattr $key "$str_temp"
hashset hash_defined_nics_tokeep $key "$str_temp"
i=$((i+1))
done

Expand Down Expand Up @@ -629,6 +636,36 @@ function configure_nicdevice {
return $errorcode
}


######################################################################
#
# Delete extra nics
# QMUL requirement - writen by Christopher J. Walker
# based on some code from confinics
#
######################################################################
function configure_remove_extra_nics {
# First find extra nics - excluding install nic (which has $MACADDRESS
str_temp=$(ip -o link | grep -vi $MACADDRESS | grep -vi loopback | grep -v SLAVE | grep -v MASTER | awk {'print $2'} | sed s/://)
old_ifs=$IFS
IFS=$'\n'
array_nics_temp=($str_temp)
IFS=$old_ifs
log_info "-r option selected - delete unconfigured nics"
for str_temp_nic in ${array_nics_temp[@]}
do
str_temp2=$(echo $(hashget hash_defined_nics_tokeep $str_temp_nic) | awk -F, '{print $1}')
if [ -n "$str_temp2" ]; then
log_info "-r option selected, but xCAT configuration found. Leave: $str_temp_nic"
else
log_info "-r option selected and card not configured by xCAT. Delete: $str_temp_nic"
configeth -r $str_temp_nic
fi
done
}



############################################################################
#
# Main process
Expand Down Expand Up @@ -704,6 +741,12 @@ parser_nic_attribute "$NICNETWORKS" "nicnetworks"
#make hash for niccustomscripts
parser_nic_attribute "$NICCUSTOMSCRIPTS" "niccustomscripts"

#Delete configuration for network cards that are not configured by xCAT
if [ $remove_nics -eq 1 ]; then
log_info "-r option selected, removing configuration for extra nics"
configure_remove_extra_nics
fi

#get nic and its device pair, for example
#eth0.6 eth0
#eth0.7 eth0
Expand Down