[Ovirt-devel] [PATCH recipe] Use ovirt-node-image RPM instead of ovirt-node-image-pxe since it has been removed

[Perry Myers]

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 appliances/ovirt/files/cobbler-import |   17 +++++++++++++----
 ovirt-recipe.spec.in                  |    3 ++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/appliances/ovirt/files/cobbler-import b/appliances/ovirt/files/cobbler-import
index 9a65351..23d2dca 100644
--- a/appliances/ovirt/files/cobbler-import
+++ b/appliances/ovirt/files/cobbler-import
@@ -6,6 +6,7 @@ url=http://download.fedora.redhat.com/pub/fedora/linux
 ksdir=/var/www/cobbler/ks_mirror
 
 set -x
+set -e
 for dir in $ksdir/* ; do
     base=$(basename $dir)
     nf=$(echo $base | awk -F - '{print NF}')
@@ -30,13 +31,18 @@ for dir in $ksdir/* ; do
         --kickstart=/etc/cobbler/sample-$os-$ver-$arch.ks
 done
 
-node_arch=$(rpm -q --qf "%{arch}" ovirt-node-image-pxe)
+node_arch=$(rpm -q --qf "%{arch}" ovirt-node-image)
+
+# Create PXE images from oVirt ISO
+tmp=$(mktemp -d)
+pushd $tmp
+ovirt-pxe /usr/share/ovirt-node-image/ovirt-node-image.iso
+popd
 
-# TODO extract Node boot params from /var/lib/tftboot/pxelinux.cfg/default
-# before Cobbler overwrites it
 cobbler distro add --name="oVirt-Node-$node_arch" --arch=$node_arch \
-    --initrd=/var/lib/tftpboot/initrd0.img --kernel=/var/lib/tftpboot/vmlinuz0 \
+    --initrd=$tmp/tftpboot/initrd0.img --kernel=$tmp/tftpboot/vmlinuz0 \
     --kopts="rootflags=loop root=/ovirt-node-image.iso rootfstype=iso9660 ro console=ttyS0,115200n8 console=tty0"
+
 cobbler profile add --name=oVirt-Node-$node_arch --distro=oVirt-Node-$node_arch
 cobbler system add --netboot-enabled=1 --profile=oVirt-Node-$node_arch \
     --name=node3 --mac=00:16:3e:12:34:57
@@ -59,6 +65,9 @@ service cobblerd restart
 cobbler sync
 cobbler list
 
+rm -Rf $tmp
+
 set +x
+set +e
 echo "Add new oVirt Nodes as Cobbler systems to make them PXE boot oVirt Node image directly."
 echo "oVirt-Node-$node_arch is also default boot option in Cobbler menu"
diff --git a/ovirt-recipe.spec.in b/ovirt-recipe.spec.in
index 2993770..638e2e0 100644
--- a/ovirt-recipe.spec.in
+++ b/ovirt-recipe.spec.in
@@ -27,7 +27,7 @@ Requires: ipa-admintools
 Requires: scsi-target-utils
 Requires: iscsi-initiator-utils
 Requires: ovirt-server
-Requires: ovirt-node-image-pxe
+Requires: ovirt-node-image
 Requires: ovirt-release
 Requires: rhpl
 Requires: cobbler
@@ -41,6 +41,7 @@ Requires: qpidd
 Requires: rubygem-qpid
 Requires: qpidc
 Requires: qmf
+Requires: livecd-tools >= 019
 
 %description
 Thincrust oVirt Server Appliance Recipe
-- 
1.6.0.3