From a31f7e46190e37b10d53d2761916dab58731bf16 Mon Sep 17 00:00:00 2001
From: Bill Peck <bpeck@redhat.com>
Date: Thu, 17 Jan 2013 11:36:23 -0500
Subject: switch from <packages> to yum install, work around for bz:896622
 Update job xml's to include netperf repo

---
 openvswitch-ovs2_4.xml | 40 ++++++++++++++++++++++++++--------------
 1 file changed, 26 insertions(+), 14 deletions(-)

(limited to 'openvswitch-ovs2_4.xml')

diff --git a/openvswitch-ovs2_4.xml b/openvswitch-ovs2_4.xml
index dd0653e..dece876 100644
--- a/openvswitch-ovs2_4.xml
+++ b/openvswitch-ovs2_4.xml
@@ -20,7 +20,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -67,7 +69,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -114,7 +118,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -147,12 +153,11 @@ EOF
 			</guestrecipe>
 			<autopick random="false"/>
 			<watchdog panic="None"/>
-			<packages>
-				<package name="@kvm"/>
-				<package name="openvswitch"/>
-			</packages>
+			<packages/>
 			<ks_appends>
 				<ks_append><![CDATA[
+yum -y install openvswitch
+
 # Turn on openvswitch 
 chkconfig --add openvswitch
 
@@ -264,6 +269,7 @@ EOF
 			</ks_appends>
 			<repos>
 				<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				<!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/"> -->
 			</repos>
 			<distroRequires>
 				<and>
@@ -326,7 +332,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -373,7 +381,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -420,7 +430,9 @@ NETMASK=255.255.255.0
 EOF
 					]]></ks_append>
 				</ks_appends>
-				<repos/>
+				<repos>
+					<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				</repos>
 				<distroRequires>
 					<and>
 						<distro_family op="=" value="RedHatEnterpriseLinux6"/>
@@ -453,12 +465,11 @@ EOF
 			</guestrecipe>
 			<autopick random="false"/>
 			<watchdog panic="None"/>
-			<packages>
-				<package name="@kvm"/>
-				<package name="openvswitch"/>
-			</packages>
+			<packages/>
 			<ks_appends>
 				<ks_append><![CDATA[
+yum -y install openvswitch
+
 # Turn on openvswitch 
 chkconfig --add openvswitch
 
@@ -569,6 +580,7 @@ EOF
 			</ks_appends>
 			<repos>
 				<repo name="openvswitch" url="http://file.bos.redhat.com/~bpeck/openvswitch/"/>
+				<!-- <repo name="openvswitch" url="http://download.devel.redhat.com/brewroot/repos/rh-folsom-rhel-6-build/latest/x86_64/"> -->
 			</repos>
 			<distroRequires>
 				<and>
-- 
cgit