xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-11-04 05:12:30 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1012 from junxiawang/0429N

Browse Source 
Update provision cases to remove "chdef -t node -o $$CN vmstorage=dir:///var/lib/libvirt/images/"
This commit is contained in:
tingtli
2016-04-29 16:58:33 +08:00
parent da486cc46c b35f933324
commit a9d29f2480
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
xCAT-test/autotest/testcase/installation/Diskless_installation_flat_p8_le
View File

@@ -3,7 +3,7 @@ os:Linux
cmd:copycds $$ISO
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then chdef -t node -o $$CN vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$CN -f && mkvm $$CN ; fi
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f && chdef $$CN mac= && mkvm $$CN ; fi
check:rc==0
cmd:makedns -n
check:rc==0

2
xCAT-test/autotest/testcase/installation/reg_linux_SN_installation_hierarchy
View File

@@ -3,7 +3,7 @@ os:Linux
cmd:chtab key=nameservers site.value="<xcatmaster>"
check:rc==0
cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "x86_64" ]];then chdef -t node -o $$SN vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$SN -f -p && mkvm $$SN -s 25G; fi
cmd:if [[ "__GETNODEATTR($$SN,arch)__" =~ "x86_64" ]];then rmvm $$SN -f && chdef $$SN mac= && mkvm $$SN ; fi
cmd:makedns -n
check:rc==0

2
xCAT-test/autotest/testcase/installation/reg_linux_diskfull_installation_flat
View File

@@ -5,7 +5,7 @@ cmd:if ping -c 1 $$SN > /dev/null;then rpower $$SN off > /dev/null;fi
cmd:chdef -t node -o $$CN servicenode= monserver=$$MN nfsserver=$$MN tftpserver=$$MN xcatmaster=$$MN
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then chdef -t node -o $$CN vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$CN -f && mkvm $$CN ; fi
cmd:if [ "__GETNODEATTR($$CN,arch)__" != "ppc64" -a "__GETNODEATTR($$CN,mgt)__" != "ipmi" ];then rmvm $$CN -f && chdef $$CN mac= && mkvm $$CN ; fi
cmd:makedns -n
check:rc==0
cmd:makeconservercf

2
xCAT-test/autotest/testcase/installation/ubuntu_diskless_installation_vm
View File

@@ -3,7 +3,7 @@ os:Linux
cmd:copycds $$ISO
check:rc==0
cmd:if [ "__GETNODEATTR($$CN,arch)__" = "x86_64" ]; then chdef -t node -o $$CN vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$CN -f && mkvm $$CN ; fi
cmd:if [ "__GETNODEATTR($$CN,arch)__" = "x86_64" ]; then rmvm $$CN -f && chdef $$CN mac= && mkvm $$CN ; fi
cmd:makedns -n
check:rc==0
cmd:makedhcp -n

2
xCAT-test/autotest/testcase/installation/ubuntu_full_installation_vm_docker
View File

@@ -2,7 +2,7 @@ start:Full_installation_flat_docker
os:Linux
cmd:copycds $$ISO
check:rc==0
cmd:if [[ "__GETNODEATTR($$DOCKERHOST,arch)__" != "ppc64" ]];then chdef -t node -o $$DOCKERHOST vmstorage=dir:///var/lib/libvirt/images/ && rmvm $$DOCKERHOST -f && mkvm $$DOCKERHOST ; fi
cmd:if [[ "__GETNODEATTR($$DOCKERHOST,arch)__" != "ppc64" ]];then rmvm $$DOCKERHOST -f && chdef $$DOCKERHOST mac= && mkvm $$DOCKERHOST ; fi
check:rc==0
cmd:makehosts $$DOCKERHOST
check:rc==0