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

update to avoid eth0/eth1 issue

This commit is contained in:
litingt 2015-05-06 22:38:12 -04:00
parent f4e8d1c233
commit f88be79e69

View File

@ -6,15 +6,10 @@ cmd:chdef $$CN nicips.$$SECONDNIC=100.1.0.100 nictypes.$$SECONDNIC=Ethernet nicn
check:rc==0
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output=~100.1.0.100
cmd:xdsh $$CN netstat -rn
check:output=~100.1.0.0
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
check:output=~100.1.0.100
check:output!~dhcp
cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
cmd:xdsh $$CN ifdown $$SECONDNIC
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
end
@ -30,12 +25,6 @@ cmd:chdef $$CN nicips.$$THIRDNIC=200.1.0.100 nictypes.$$THIRDNIC=Ethernet nicnet
check:rc==0
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output=~100.1.0.100
check:output=~200.1.0.100
cmd:xdsh $$CN netstat -rn
check:output=~100.1.0.0
check:output=~200.1.0.0
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
check:output=~100.1.0.100
check:output!~dhcp
@ -44,8 +33,6 @@ check:output=~200.1.0.100
check:output!~dhcp
cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
cmd:rmdef -t network -o 200_1_0_0-255_255_0_0
cmd:xdsh $$CN ifdown $$SECONDNIC
cmd:xdsh $$CN ifdown $$THIRDNIC
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
end
@ -66,16 +53,6 @@ cmd:chdef $$CN nicips.$$THIRDNIC="13.1.0.100|14.1.0.100" nictypes.$$THIRDNIC=Eth
check:rc==0
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output=~11.1.0.100
check:output=~12.1.0.100
check:output=~13.1.0.100
check:output=~14.1.0.100
cmd:xdsh $$CN netstat -rn
check:output=~11.1.0.0
check:output=~12.1.0.0
check:output=~13.1.0.0
check:output=~14.1.0.0
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
check:output=~11.1.0.100
check:output!~dhcp
@ -92,8 +69,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
cmd:xdsh $$CN ifdown $$SECONDNIC
cmd:xdsh $$CN ifdown $$THIRDNIC
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
@ -125,16 +100,6 @@ check:output=~$$CN-$$THIRDNIC-1
check:output=~$$CN-$$THIRDNIC-2
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output=~11.1.0.100
check:output=~12.1.0.100
check:output=~13.1.0.100
check:output=~14.1.0.100
cmd:xdsh $$CN netstat -rn
check:output=~11.1.0.0
check:output=~12.1.0.0
check:output=~13.1.0.0
check:output=~14.1.0.0
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
check:output=~11.1.0.100
check:output!~dhcp
@ -151,8 +116,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
cmd:xdsh $$CN ifdown $$SECONDNIC
cmd:xdsh $$CN ifdown $$THIRDNIC
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
@ -183,16 +146,6 @@ check:output=~aliases2-1
check:output=~aliases2-2
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output=~11.1.0.100
check:output=~12.1.0.100
check:output=~13.1.0.100
check:output=~14.1.0.100
cmd:xdsh $$CN netstat -rn
check:output=~11.1.0.0
check:output=~12.1.0.0
check:output=~13.1.0.0
check:output=~14.1.0.0
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
check:output=~11.1.0.100
check:output!~dhcp
@ -209,8 +162,6 @@ cmd:rmdef -t network -o 11_1_0_0-255_255_0_0
cmd:rmdef -t network -o 12_1_0_0-255_255_0_0
cmd:rmdef -t network -o 13_1_0_0-255_255_0_0
cmd:rmdef -t network -o 14_1_0_0-255_255_0_0
cmd:xdsh $$CN ifdown $$SECONDNIC
cmd:xdsh $$CN ifdown $$THIRDNIC
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$SECONDNIC:1; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$SECONDNIC:1; fi
cmd:if [ "$$OS" = "ubuntu" ];then xdsh $$CN rm -rf /etc/network/interfaces.d/$$THIRDNIC; else xdsh $$CN rm -rf /etc/sysconfig/network*/ifcfg-$$THIRDNIC; fi
@ -228,10 +179,6 @@ cmd:chtab node=$$CN nics.disable=yes
check:rc==0
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output!~100.1.0.100
cmd:xdsh $$CN netstat -rn
check:output!~100.1.0.0
cmd:if [ "$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC; fi
check:output!~100.1.0.100
cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
@ -249,14 +196,9 @@ cmd:chtab node=$$CN nics.disable=1
check:rc==0
cmd:updatenode $$CN -P confignics
check:rc==0
cmd:xdsh $$CN ifconfig
check:output!~100.1.0.100
cmd:xdsh $$CN netstat -rn
check:output!~100.1.0.0
cmd:if [ "$OS" = "ubuntu" ];then xdsh $$CN cat /etc/network/interfaces.d/$$SECONDNIC; else xdsh $$CN cat /etc/sysconfig/network-scripts/ifcfg-$$SECONDNIC; fi
check:output!~100.1.0.100
cmd:rmdef -t network -o 100_1_0_0-255_255_0_0
cmd:chtab node=$$CN nics.disable=0
end