diff options
-rwxr-xr-x | kernel/networking/openvswitch/libvirt/add_interface/runtest.sh | 2 | ||||
-rw-r--r-- | openvswitch-job.xml | 12 | ||||
-rw-r--r-- | openvswitch-ovs2_4-baseconnectivity.xml | 6 | ||||
-rw-r--r-- | openvswitch-ovs2_4-vlan.xml | 24 | ||||
-rw-r--r-- | openvswitch-ovs2_4.xml | 24 |
5 files changed, 1 insertions, 67 deletions
diff --git a/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh b/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh index 637eeee..b9a14d3 100755 --- a/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh +++ b/kernel/networking/openvswitch/libvirt/add_interface/runtest.sh @@ -54,7 +54,7 @@ add_vlan() local guest=$1 local switch=$2 local vlan=$(echo $3| sed -e 's/vlan//') - sed -ie "/<source bridge='$switch'\/>/ a \<vlan trunk='yes'>\n<tag id='$vlan'\/>\n<\/vlan>" $guest + sed -ie "/<source bridge='$switch'\/>/ a \<vlan>\n<tag id='$vlan'\/>\n<\/vlan>" $guest virsh define --file $guest return $? } diff --git a/openvswitch-job.xml b/openvswitch-job.xml index ba63b8d..8585b45 100644 --- a/openvswitch-job.xml +++ b/openvswitch-job.xml @@ -30,9 +30,6 @@ <param name="CMDS_TO_RUN" value="sleep 1000"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_x86_64_hvm_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="hvm install of guest=rhel6u4_x86_64_hvm vcpus=1 memory=1024 container=file installer=nfs" role="vlan100"> <autopick random="false"/> @@ -60,9 +57,6 @@ <param name="CMDS_TO_RUN" value="sleep 1000"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_i386_hvm_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="hvm install of guest=rhel6u4_i386_hvm vcpus=1 memory=1024 container=file installer=nfs" role="vlan101"> <autopick random="false"/> @@ -90,9 +84,6 @@ <param name="CMDS_TO_RUN" value="sleep 1000"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> @@ -136,9 +127,6 @@ <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> </recipeSet> </job> diff --git a/openvswitch-ovs2_4-baseconnectivity.xml b/openvswitch-ovs2_4-baseconnectivity.xml index 2c9fda4..6974bef 100644 --- a/openvswitch-ovs2_4-baseconnectivity.xml +++ b/openvswitch-ovs2_4-baseconnectivity.xml @@ -121,9 +121,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.21 192.168.2.41"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard=""> <autopick random="false"/> @@ -242,9 +239,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.21 192.168.2.41"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> </recipeSet> </job> diff --git a/openvswitch-ovs2_4-vlan.xml b/openvswitch-ovs2_4-vlan.xml index 2b8b55c..98174f4 100644 --- a/openvswitch-ovs2_4-vlan.xml +++ b/openvswitch-ovs2_4-vlan.xml @@ -50,9 +50,6 @@ EOF <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_u2" role="None"> <autopick random="false"/> @@ -103,9 +100,6 @@ EOF <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_3" role="None"> <autopick random="false"/> @@ -153,9 +147,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> @@ -319,9 +310,6 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_4 rhel6u4_5 rhel6u4_6"> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_4" role="None"> @@ -370,9 +358,6 @@ EOF <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_5" role="None"> <autopick random="false"/> @@ -420,9 +405,6 @@ EOF <param name="INVALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_6" role="None"> <autopick random="false"/> @@ -470,9 +452,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.3 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> @@ -635,9 +614,6 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> </recipeSet> </job> diff --git a/openvswitch-ovs2_4.xml b/openvswitch-ovs2_4.xml index dece876..e94c2ff 100644 --- a/openvswitch-ovs2_4.xml +++ b/openvswitch-ovs2_4.xml @@ -49,9 +49,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_2" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_u2" role="None"> <autopick random="false"/> @@ -98,9 +95,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_3" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_3" role="None"> <autopick random="false"/> @@ -147,9 +141,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> @@ -311,9 +302,6 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> <recipe kernel_options="" kernel_options_post="" ks_meta="" role="None" whiteboard="rhel6u4_4 rhel6u4_5 rhel6u4_6"> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_4" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_4" role="None"> @@ -361,9 +349,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_5" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_5" role="None"> <autopick random="false"/> @@ -410,9 +395,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <guestrecipe guestargs=" -s 10 --hvm --kvm" guestname="rhel6u4_6" kernel_options="" kernel_options_post="" ks_meta="" whiteboard="rhel6u4_6" role="None"> <autopick random="false"/> @@ -459,9 +441,6 @@ EOF <param name="VALID_ADDRS" value="192.168.2.1 192.168.2.2 192.168.2.3 192.168.2.4 192.168.2.5 192.168.2.6"/> </params> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </guestrecipe> <autopick random="false"/> <watchdog panic="None"/> @@ -622,9 +601,6 @@ EOF <task name="/distribution/virt/start" role="STANDALONE"> <params/> </task> - <task name="/distribution/reservesys" role="STANDALONE"> - <params/> - </task> </recipe> </recipeSet> </job> |