[Ovirt-devel] [PATCH appliance] RESEND - required changes to move from ovirt-recipe to ovirt-server-installer

[Joey Boggs]

---
 ovirt-appliance.ks |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/ovirt-appliance.ks b/ovirt-appliance.ks
index 81cb010..3d03cf7 100644
--- a/ovirt-appliance.ks
+++ b/ovirt-appliance.ks
@@ -2,14 +2,14 @@ install
 
 lang en_US.UTF-8
 keyboard us
-network --device=eth0 --bootproto=static --ip=192.168.50.2 --netmask=255.255.255.0 --onboot=on --nameserver=192.168.50.2 --hostname=management.priv.ovirt.org
+network --device=eth0 --bootproto=static --ip=192.168.50.2 --netmask=255.255.255.0 --onboot=on --nameserver=192.168.50.2
 # Root password is 'ovirt'
 rootpw --iscrypted Xa8QeYfWrtscM
 firewall --disabled
 authconfig --enableshadow --enablemd5
 selinux --disabled
 # NOTE: ntp/ntpdate need to stay in this list to ensure that time on the
-# appliance is correct prior to the appliance recipe being run.  Otherwise you
+# appliance is correct prior to the ovirt-server-installer being run.  Otherwise you
 # get Kerberos errors
 services --disabled=libvirtd,postgresql --enabled=network,tgtd,nfs,iptables,ntpdate,ntpd,ace,acpid
 timezone --utc UTC
@@ -28,7 +28,30 @@ reboot
 
 %packages --excludedocs --nobase
 %include /usr/share/appliance-os/includes/base-pkgs.ks
-ovirt-recipe
+openssh-clients
+openssh-server
+nfs-utils
+collectd
+collectd-rrdtool
+ipa-server
+ipa-admintools
+scsi-target-utils
+iscsi-initiator-utils
+augeas
+syslinux
+curl
+bind-utils
+libvirt-python
+rhpl
+cobbler
+# Stupid yum dep solver pulls in older 'qemu' to resolve
+# /usr/bin/qemu-img dep. This forces it to pick the new
+# qemu-img RPM.
+qemu-img
+ovirt-release
+ovirt-node-image
+ovirt-server
+ovirt-server-installer
 lokkit
 
 %post
@@ -40,7 +63,7 @@ lokkit
 
   # The ace stuff.
   mkdir /etc/sysconfig/ace
-  echo ovirt >> /etc/sysconfig/ace/appliancename
+  echo ovirt-appliance >> /etc/sysconfig/ace/appliancename
 %end
 
 %post
@@ -82,9 +105,9 @@ lokkit
   du -akx --exclude=/var/cache/yum / > $manifests/file-manifest-post.txt
   du -x --exclude=/var/cache/yum / > $manifests/dir-manifest-post.txt
 
-  ver=$(rpm -q --qf '%{version}' ovirt-recipe)
-  rel=$(rpm -q --qf '%{release}' ovirt-recipe)
-  arch=$(rpm -q --qf '%{arch}' ovirt-recipe)
+  ver=$(rpm -q --qf '%{version}' ovirt-server-installer)
+  rel=$(rpm -q --qf '%{release}' ovirt-server-installer)
+  arch=$(rpm -q --qf '%{arch}' ovirt-server-installer)
   echo "oVirt Appliance release $ver-$rel-$arch" > $manifests/ovirt-release
   tar -cvf ovirt-appliance-manifests-$ver-$rel.$arch.tar -C /tmp manifests
   rm -Rf $manifests
-- 
1.6.0.6