Anatoly Litovsky has uploaded a new change for review. Change subject: Removing unsupported platforms ......................................................................
Removing unsupported platforms Change-Id: Ie551e173a1aef45bb62c13e3cdf8e01dc2621ac1 Signed-off-by: Tolik Litovsky <[email protected]> --- D recipe/centos6-install.ks D recipe/centos6-minimizer.ks D recipe/centos6-pkgs.ks D recipe/centos6-post.ks D recipe/ovirt17-install.ks D recipe/ovirt17-minimizer.ks D recipe/ovirt17-pkgs.ks D recipe/ovirt17-post.ks D recipe/ovirt18-install.ks D recipe/ovirt18-minimizer.ks D recipe/ovirt18-pkgs.ks D recipe/ovirt18-post.ks D recipe/ovirt19-install.ks D recipe/ovirt19-minimizer.ks D recipe/ovirt19-pkgs.ks D recipe/ovirt19-post.ks D recipe/ovirt20-install.ks D recipe/ovirt20-minimizer.ks D recipe/ovirt20-pkgs.ks D recipe/ovirt20-post.ks D recipe/rhevh6-install.ks D recipe/rhevh6-minimizer.ks D recipe/rhevh6-pkgs.ks D recipe/rhevh6-post.ks 24 files changed, 0 insertions(+), 786 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/27/44827/1 diff --git a/recipe/centos6-install.ks b/recipe/centos6-install.ks deleted file mode 100644 index bfcb9d5..0000000 --- a/recipe/centos6-install.ks +++ /dev/null @@ -1 +0,0 @@ -services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt-post,cgconfig,tuned,libvirtd --disabled=netfs,ovirt-awake,libvirt-guests diff --git a/recipe/centos6-minimizer.ks b/recipe/centos6-minimizer.ks deleted file mode 100644 index 9e2a998..0000000 --- a/recipe/centos6-minimizer.ks +++ /dev/null @@ -1,9 +0,0 @@ -# RHEL specific image minimization -droprpm cvs -droprpm gettext -droprpm hesiod -droprpm procmail -droprpm sendmail -drop /etc/rc.d/init.d/libvirt-guests -drop /var/lib/yum -drop /etc/yum.repos.d/C* diff --git a/recipe/centos6-pkgs.ks b/recipe/centos6-pkgs.ks deleted file mode 100644 index 422ef87..0000000 --- a/recipe/centos6-pkgs.ks +++ /dev/null @@ -1,11 +0,0 @@ -collectd-virt -qemu-kvm -# rhbz#641494 RFE - add libguestfs -libguestfs -ltrace -# keyboard layout -system-config-keyboard-base -iproute -aic94xx-firmware -bfa-firmware -ql2500-firmware diff --git a/recipe/centos6-post.ks b/recipe/centos6-post.ks deleted file mode 100644 index 75bbf05..0000000 --- a/recipe/centos6-post.ks +++ /dev/null @@ -1,168 +0,0 @@ -# add RHEV-H rwtab locations -mkdir -p /rhev -cat > /etc/rwtab.d/rhev << EOF_RWTAB_RHEVH -dirs /var/db -dirs /var/lib/rhsm -EOF_RWTAB_RHEVH - -# minimal lsb_release for bz#549147 -cat > /usr/bin/lsb_release <<\EOF_LSB -#!/bin/sh -if [ "$1" = "-r" ]; then - printf "Release:\t$(cat /etc/rhev-hypervisor-release | awk '{print $7}')\n" -else - echo RedHatEnterpriseVirtualizationHypervisor -fi -EOF_LSB -chmod +x /usr/bin/lsb_release - -# CPE name rhbz#593463 -cat > /etc/system-release-cpe <<\EOF_CPE -cpe:/o:redhat:enterprise_linux:6:update2:hypervisor -EOF_CPE - -echo "Configuring IPTables" -# here, we need to punch the appropriate holes in the firewall -cat > /etc/sysconfig/iptables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt tls --A INPUT -p tcp --dport 16514 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# gluster --A INPUT -p tcp --dport 24007 -j ACCEPT --A INPUT -p tcp --dport 24009:24109 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited -COMMIT -EOF -# configure IPv6 firewall, default is all ACCEPT -cat > /etc/sysconfig/ip6tables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p ipv6-icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt tls --A INPUT -p tcp --dport 16514 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# unblock ipv6 dhcp response --A INPUT -p udp --dport 546 -j ACCEPT --A INPUT -j REJECT --reject-with icmp6-adm-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited -COMMIT -EOF - -# remove errors from /sbin/dhclient-script -DHSCRIPT=/sbin/dhclient-script -sed -i 's/mv /cp -p /g' $DHSCRIPT -sed -i '/rm -f.*${interface}/d' $DHSCRIPT -sed -i '/rm -f \/etc\/localtime/d' $DHSCRIPT -sed -i '/rm -f \/etc\/ntp.conf/d' $DHSCRIPT -sed -i '/rm -f \/etc\/yp.conf/d' $DHSCRIPT - -# prevent node from hanging on reboot due to /etc mounts -patch -d /etc/init.d/ -p0 << \EOF_halt ---- halt.orig 2009-12-05 00:44:29.000000000 +0000 -+++ halt 2010-03-24 18:12:36.000000000 +0000 -@@ -138,7 +138,7 @@ - $"Unmounting pipe file systems (retry): " \ - -f - --LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next} -+LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/etc|^\/dev/{next} - $3 == "tmpfs" || $3 == "proc" {print $2 ; next} - /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} - {print $2}' /proc/mounts \ -EOF_halt - -# rhbz#675868 -# Modify rc.sysinit -patch -d /etc/rc.d -p0 << \EOF_rc_sysinit ---- rc.sysinit.orig 2012-08-27 12:59:56.181488153 +0530 -+++ rc.sysinit 2012-08-27 13:02:45.554484158 +0530 -@@ -43,7 +43,7 @@ - fi - - if [ -n "$SELINUX_STATE" -a -x /sbin/restorecon ] && __fgrep " /dev " /proc/mounts >/dev/null 2>&1 ; then -- /sbin/restorecon -R -F /dev 2>/dev/null -+ /sbin/restorecon -e /dev/.initramfs -R /dev 2>/dev/null - fi - - disable_selinux() { -EOF_rc_sysinit - -if grep -q 6.6 /etc/system-release; then - patch -d /etc/rc.d -p0 << \EOF_rc_sysinit -@@ -513,9 +513,9 @@ - # filesystems are NOT unmounted in single user mode. - # The 'no' applies to all listed filesystem types. See mount(8). - if [ "$READONLY" != "yes" ] ; then -- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs -O no_netdev -+ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs,noproc,nosysfs,nodevpts -O no_netdev - else -- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs -O no_netdev -+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs,noproc,nosysfs,nodevpts -O no_netdev - fi - - # Update quotas if necessary -EOF_rc_sysinit -else - patch -d /etc/rc.d -p0 << \EOF_rc_sysinit -@@ -503,9 +503,9 @@ - # filesystems are NOT unmounted in single user mode. - # The 'no' applies to all listed filesystem types. See mount(8). - if [ "$READONLY" != "yes" ] ; then -- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev - else -- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev - fi - - # Update quotas if necessary -EOF_rc_sysinit -fi - -# rhbz#675868 -# Modify start_udev -patch -d /sbin -p0 << \EOF_start_udev ---- start_udev.orig 2011-03-30 12:32:03.000000000 +0000 -+++ start_udev 2011-09-02 17:16:57.954610422 +0000 -@@ -121,7 +121,7 @@ - #/bin/chown root:root /dev/fuse - - if [ -x /sbin/restorecon ]; then -- /sbin/restorecon -R /dev -+ /sbin/restorecon -e /dev/.initramfs -R /dev - fi - - if [ -x "$MAKEDEV" ]; then -EOF_start_udev - -# set maxlogins to 3 -echo "* - maxlogins 3" >> /etc/security/limits.conf diff --git a/recipe/ovirt17-install.ks b/recipe/ovirt17-install.ks deleted file mode 100644 index 25cd719..0000000 --- a/recipe/ovirt17-install.ks +++ /dev/null @@ -1 +0,0 @@ -services --enabled=auditd,ntpd,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,ovirt-kdump,anyterm,collectd,libvirtd,cgconfig,mcelog,tuned --disabled=kdump diff --git a/recipe/ovirt17-minimizer.ks b/recipe/ovirt17-minimizer.ks deleted file mode 100644 index 3f967d0..0000000 --- a/recipe/ovirt17-minimizer.ks +++ /dev/null @@ -1,2 +0,0 @@ -# Fedora specific image minimization -keep /usr/share/virt-manager diff --git a/recipe/ovirt17-pkgs.ks b/recipe/ovirt17-pkgs.ks deleted file mode 100644 index 4188a7b..0000000 --- a/recipe/ovirt17-pkgs.ks +++ /dev/null @@ -1,12 +0,0 @@ -%include fedora-pkgs.ks -virt-manager-tui -grub2-efi -firewalld -selinux-policy-devel -shim -# qlogic firmware -ql2100-firmware -ql2200-firmware -ql23xx-firmware -ql2400-firmware -ql2500-firmware diff --git a/recipe/ovirt17-post.ks b/recipe/ovirt17-post.ks deleted file mode 100644 index 3199c05..0000000 --- a/recipe/ovirt17-post.ks +++ /dev/null @@ -1,73 +0,0 @@ -# ovirt-install-node-stateless -# ovirt_setup_libvirtd() - # just to get a boot warning to shut up - touch /etc/resolv.conf - - # set up qemu daemon to allow outside VNC connections - sed -i -e 's/^[[:space:]]*#[[:space:]]*\(vnc_listen = "0.0.0.0"\).*/\1/' \ - /etc/libvirt/qemu.conf - - # disable mdns/avahi - sed -i -e 's/^[[:space:]]*#[[:space:]]*\(mdns_adv = 0\).*/\1/' \ - /etc/libvirt/qemu.conf - -#ovirt_setup_anyterm() - # configure anyterm - cat >> /etc/sysconfig/anyterm << \EOF_anyterm -ANYTERM_CMD="sudo /usr/bin/virsh console %p" -ANYTERM_LOCAL_ONLY=false -EOF_anyterm - - # permit it to run the virsh console - echo "anyterm ALL=NOPASSWD: /usr/bin/virsh console *" >> /etc/sudoers - -# systemd configuration -# set default runlevel to multi-user(3) - -rm -rf /etc/systemd/system/default.target -ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target -systemctl enable ovirt-firstboot.service >/dev/null 2>&1 -systemctl enable ovirt-kdump.service >/dev/null 2>&1 - -echo "Configuring IPTables" -# here, we need to punch the appropriate holes in the firewall -cat > /usr/lib/firewalld/services/ovirt.xml << \EOF -<?xml version="1.0" encoding="utf-8"?> -<service> - <short>ovirt-node</short> - <description>This service opens necessary ports for ovirt-node operations</description> - <!-- libvirt tls --> - <port protocol="tcp" port="16514"/> - <!-- guest consoles --> - <port protocol="tcp" port="5634-6166"/> - <!-- migration --> - <port protocol="tcp" port="49152-49216"/> - <!-- snmp --> - <port protocol="udp" port="161"/> -</service> -EOF - -# enable required services -firewall-offline-cmd -s ssh -firewall-offline-cmd -s ovirt -firewall-offline-cmd -s dhcpv6-client - -python -m compileall /usr/share/virt-manager - -echo "-w /etc/shadow -p wa" >> /etc/audit/audit.rules - -# Workaround for packages needing /etc/ovirt-node-image-release -ln -s /etc/system-release /etc/ovirt-node-image-release - -#Add some upstream specific rwtab entries -cat >> /etc/rwtab.d/ovirt << \EOF_rwtab_ovirt2 -dirs /root/.virt-manager -dirs /admin/.virt-manager -EOF_rwtab_ovirt2 - -# create .virt-manager directories for readonly root -mkdir -p /root/.virt-manager /home/admin/.virt-manager - -#symlink virt-manager-tui pointer file to .pyc version -sed -i "s/tui.py/tui.pyc/g" /usr/bin/virt-manager-tui - diff --git a/recipe/ovirt18-install.ks b/recipe/ovirt18-install.ks deleted file mode 120000 index 7598263..0000000 --- a/recipe/ovirt18-install.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt17-install.ks \ No newline at end of file diff --git a/recipe/ovirt18-minimizer.ks b/recipe/ovirt18-minimizer.ks deleted file mode 100644 index 47db2a1..0000000 --- a/recipe/ovirt18-minimizer.ks +++ /dev/null @@ -1,40 +0,0 @@ -# Fedora specific image minimization -drop /usr/sbin/wpa* -drop /usr/sbin/eapol_test -droprpm gsettings-desktop-schemas - -# qemu minimization -droprpm qemu-system-alpha -droprpm qemu-system-arm -droprpm qemu-system-cris -droprpm qemu-system-lm32 -droprpm qemu-system-m68k -droprpm qemu-system-microblaze -droprpm qemu-system-mips -droprpm qemu-system-or32 -droprpm qemu-system-ppc -droprpm qemu-system-s390x -droprpm qemu-system-sh4 -droprpm qemu-system-sparc -droprpm qemu-system-unicore -droprpm qemu-system-xtensa -droprpm qemu-user - -# libguestfs related minimization -# The following rpms can be dropped and don't harm libguestfs too much -droprpm SLOF -droprpm cups-libs -droprpm ghostscript -droprpm ghostscript-fonts -droprpm fuse -droprpm zfs-fuse -droprpm gfs2-utils -droprpm hfsplus-tools -droprpm lcms2 -droprpm libXfont -droprpm libXt -droprpm libfontenc -droprpm xorg-x11-font-utils -droprpm man-db -droprpm zerofree -droprpm firewalld diff --git a/recipe/ovirt18-pkgs.ks b/recipe/ovirt18-pkgs.ks deleted file mode 100644 index 3e42e8c..0000000 --- a/recipe/ovirt18-pkgs.ks +++ /dev/null @@ -1,10 +0,0 @@ -%include fedora-pkgs.ks -grub-efi -grub2-efi -firewalld -selinux-policy-devel -shim -# qlogic firmware -ql2400-firmware -ql2500-firmware -linux-firmware diff --git a/recipe/ovirt18-post.ks b/recipe/ovirt18-post.ks deleted file mode 120000 index 6a614bf..0000000 --- a/recipe/ovirt18-post.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt17-post.ks \ No newline at end of file diff --git a/recipe/ovirt19-install.ks b/recipe/ovirt19-install.ks deleted file mode 120000 index 2bcf3da..0000000 --- a/recipe/ovirt19-install.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt18-install.ks \ No newline at end of file diff --git a/recipe/ovirt19-minimizer.ks b/recipe/ovirt19-minimizer.ks deleted file mode 120000 index 94a7845..0000000 --- a/recipe/ovirt19-minimizer.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt18-minimizer.ks \ No newline at end of file diff --git a/recipe/ovirt19-pkgs.ks b/recipe/ovirt19-pkgs.ks deleted file mode 100644 index d6e7e0c..0000000 --- a/recipe/ovirt19-pkgs.ks +++ /dev/null @@ -1,14 +0,0 @@ -%include fedora-pkgs.ks -grub2-efi -firewalld -selinux-policy-devel -shim -# qlogic firmware -linux-firmware -iptables -net-tools -iproute -aic94xx-firmware -bfa-firmware -# Explicitly add these package, to prevent yum from pulling in the debug versions -kernel-modules-extra diff --git a/recipe/ovirt19-post.ks b/recipe/ovirt19-post.ks deleted file mode 100644 index a039a6c..0000000 --- a/recipe/ovirt19-post.ks +++ /dev/null @@ -1,126 +0,0 @@ -# According with man systemd-journald.service: -# By default, the journal stores log data in /run/log/journal/. -# Since /run/ is volatile, log data is lost at reboot. To make the data -# persistent, it is sufficient to create /var/log/journal/ where -# systemd-journald will then store the data -install -dm 0755 /var/log/journal - -# ovirt-install-node-stateless -# ovirt_setup_libvirtd() - # just to get a boot warning to shut up - touch /etc/resolv.conf - - # set up qemu daemon to allow outside VNC connections - sed -i -e 's/^[[:space:]]*#[[:space:]]*\(vnc_listen = "0.0.0.0"\).*/\1/' \ - /etc/libvirt/qemu.conf - - # disable mdns/avahi - sed -i -e 's/^[[:space:]]*#[[:space:]]*\(mdns_adv = 0\).*/\1/' \ - /etc/libvirt/qemu.conf - -#ovirt_setup_anyterm() - # configure anyterm - cat >> /etc/sysconfig/anyterm << \EOF_anyterm -ANYTERM_CMD="sudo /usr/bin/virsh console %p" -ANYTERM_LOCAL_ONLY=false -EOF_anyterm - - # permit it to run the virsh console - echo "anyterm ALL=NOPASSWD: /usr/bin/virsh console *" >> /etc/sudoers - -# dracut config -cat <<_EOF_ > /etc/dracut.conf.d/ovirt-node.conf - -add_dracutmodules+=" dmsquash-live " - -_EOF_ - -# systemd configuration -# set default runlevel to multi-user(3) - -rm -rf /etc/systemd/system/default.target -ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target -systemctl enable ovirt-firstboot.service >/dev/null 2>&1 - -echo "Configuring IPTables" -# here, we need to punch the appropriate holes in the firewall -# disabled until ovirt-engine supports firewalld - -#cat > /usr/lib/firewalld/services/ovirt.xml << \EOF -#<?xml version="1.0" encoding="utf-8"?> -#<service> -# <short>ovirt-node</short> -# <description>This service opens necessary ports for ovirt-node operations</description> -# <!-- libvirt tls --> -# <port protocol="tcp" port="16514"/> -# <!-- guest consoles --> -# <port protocol="tcp" port="5634-6166"/> -# <!-- migration --> -# <port protocol="tcp" port="49152-49216"/> -# <!-- snmp --> -# <port protocol="udp" port="161"/> -#</service> -#EOF - -# enable required services -#firewall-offline-cmd -s ssh -#firewall-offline-cmd -s ovirt -#firewall-offline-cmd -s dhcpv6-client - -cat > /etc/sysconfig/iptables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -#vdsm --A INPUT -p tcp --dport 54321 -j ACCEPT -# libvirt tls --A INPUT -p tcp --dport 16514 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# gluster --A INPUT -p tcp --dport 24007 -j ACCEPT --A INPUT -p tcp --dport 24009:24109 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited -COMMIT -EOF -# configure IPv6 firewall, default is all ACCEPT -cat > /etc/sysconfig/ip6tables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p ipv6-icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# unblock ipv6 dhcp response --A INPUT -p udp --dport 546 -j ACCEPT --A INPUT -j REJECT --reject-with icmp6-adm-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited -COMMIT -EOF -echo "-w /etc/shadow -p wa" >> /etc/audit/audit.rules - -# Workaround for packages needing /etc/ovirt-node-image-release -ln -s /etc/system-release /etc/ovirt-node-image-release diff --git a/recipe/ovirt20-install.ks b/recipe/ovirt20-install.ks deleted file mode 120000 index 45a5092..0000000 --- a/recipe/ovirt20-install.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt19-install.ks \ No newline at end of file diff --git a/recipe/ovirt20-minimizer.ks b/recipe/ovirt20-minimizer.ks deleted file mode 120000 index 5d64836..0000000 --- a/recipe/ovirt20-minimizer.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt19-minimizer.ks \ No newline at end of file diff --git a/recipe/ovirt20-pkgs.ks b/recipe/ovirt20-pkgs.ks deleted file mode 100644 index d2cfca4..0000000 --- a/recipe/ovirt20-pkgs.ks +++ /dev/null @@ -1,18 +0,0 @@ -%include fedora-pkgs.ks -grub2-efi -firewalld -selinux-policy-devel -shim -# qlogic firmware -linux-firmware -iptables -net-tools -iproute -bfa-firmware -grubby -glusterfs-server -# Explicitly add these package, to prevent yum from pulling in the debug versions -kernel-modules-extra - -# To disable hostonly mode -dracut-config-generic diff --git a/recipe/ovirt20-post.ks b/recipe/ovirt20-post.ks deleted file mode 120000 index e852780..0000000 --- a/recipe/ovirt20-post.ks +++ /dev/null @@ -1 +0,0 @@ -ovirt19-post.ks \ No newline at end of file diff --git a/recipe/rhevh6-install.ks b/recipe/rhevh6-install.ks deleted file mode 100644 index 5edde2e..0000000 --- a/recipe/rhevh6-install.ks +++ /dev/null @@ -1,3 +0,0 @@ -services --enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt-post,ovirt-cim,ovirt-kdump,cgconfig,mcelog,tuned,libvirtd --disabled=netfs,ovirt-awake,libvirt-guests,kdump - - diff --git a/recipe/rhevh6-minimizer.ks b/recipe/rhevh6-minimizer.ks deleted file mode 100644 index e2ef3cb..0000000 --- a/recipe/rhevh6-minimizer.ks +++ /dev/null @@ -1,7 +0,0 @@ -# RHEL specific image minimization -droprpm cvs -droprpm gettext -droprpm hesiod -droprpm procmail -droprpm sendmail -drop /etc/rc.d/init.d/libvirt-guests diff --git a/recipe/rhevh6-pkgs.ks b/recipe/rhevh6-pkgs.ks deleted file mode 100644 index 54742b0..0000000 --- a/recipe/rhevh6-pkgs.ks +++ /dev/null @@ -1,20 +0,0 @@ -# remove --redhat-release-notes -# rhbz#641494 RFE - add libguestfs -libguestfs-winsupport -ltrace -vhostmd -# keyboard layout -system-config-keyboard-base -# qlogic firmware -ql2100-firmware -ql2200-firmware -ql23xx-firmware -ql2400-firmware -ql2500-firmware -aic94xx-firmware -bfa-firmware -iproute -#default plugins -ovirt-node-plugin-snmp -ovirt-node-plugin-cim diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks deleted file mode 100644 index 4ca6fb9..0000000 --- a/recipe/rhevh6-post.ks +++ /dev/null @@ -1,264 +0,0 @@ -%include version.ks - -# add RHEV-H rwtab locations -mkdir -p /rhev -cat > /etc/rwtab.d/rhev << EOF_RWTAB_RHEVH -dirs /var/db -EOF_RWTAB_RHEVH - -# minimal lsb_release for bz#549147 -cat > /usr/bin/lsb_release <<\EOF_LSB -#!/bin/sh -if [ "$1" = "-r" ]; then - printf "Release:\t$(cat /etc/rhev-hypervisor-release | awk '{print $7}')\n" -else - echo RedHatEnterpriseVirtualizationHypervisor -fi -EOF_LSB -chmod +x /usr/bin/lsb_release - -# CPE name rhbz#593463 -MAJORVER=${VERSION%%.*} -MINORVER=${VERSION##*.} -cat > /etc/system-release-cpe <<EOF_CPE -cpe:/o:redhat:enterprise_linux:${MAJORVER}:update${MINORVER}:hypervisor${TYPE} -EOF_CPE - -echo "Installing libvirtd.upstart file" -# https://bugzilla.redhat.com/show_bug.cgi?id=1233059 -# We install the file to /etc/init - now we need to copy it into -# place for vdsm. vdsm retrieves the upstart path by querying rpm -LIBVIRT_UPSTART=$(rpm -ql libvirt | grep upstart) -echo "Using ${LIBVIRT_UPSTART}" -mkdir -vp $(dirname ${LIBVIRT_UPSTART}) -cp -v /usr/share/ovirt-node/libvirtd.upstart ${LIBVIRT_UPSTART} - -echo "Configuring IPTables" -# here, we need to punch the appropriate holes in the firewall -cat > /etc/sysconfig/iptables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt tls --A INPUT -p tcp --dport 16514 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# --A INPUT -j REJECT --reject-with icmp-host-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp-host-prohibited -COMMIT -EOF -# configure IPv6 firewall, default is all ACCEPT -cat > /etc/sysconfig/ip6tables << \EOF -# oVirt automatically generated firewall configuration -*filter -:INPUT ACCEPT [0:0] -:FORWARD ACCEPT [0:0] -:OUTPUT ACCEPT [0:0] --A INPUT -m state --state ESTABLISHED,RELATED -j ACCEPT --A INPUT -p ipv6-icmp -j ACCEPT --A INPUT -i lo -j ACCEPT -# libvirt tls --A INPUT -p tcp --dport 16514 -j ACCEPT -# SSH --A INPUT -p tcp --dport 22 -j ACCEPT -# guest consoles --A INPUT -p tcp -m multiport --dports 5634:6166 -j ACCEPT -# migration --A INPUT -p tcp -m multiport --dports 49152:49216 -j ACCEPT -# snmp --A INPUT -p udp --dport 161 -j ACCEPT -# unblock ipv6 dhcp response --A INPUT -p udp --dport 546 -j ACCEPT --A INPUT -j REJECT --reject-with icmp6-adm-prohibited --A FORWARD -m physdev ! --physdev-is-bridged -j REJECT --reject-with icmp6-adm-prohibited -COMMIT -EOF - -# remove errors from /sbin/dhclient-script -DHSCRIPT=/sbin/dhclient-script -sed -i 's/mv /cp -p /g' $DHSCRIPT -sed -i '/rm -f.*${interface}/d' $DHSCRIPT -sed -i '/rm -f \/etc\/localtime/d' $DHSCRIPT -sed -i '/rm -f \/etc\/ntp.conf/d' $DHSCRIPT -sed -i '/rm -f \/etc\/yp.conf/d' $DHSCRIPT - -# prevent node from hanging on reboot due to /etc mounts -patch -d /etc/init.d/ -p0 << \EOF_halt ---- halt.orig 2009-12-05 00:44:29.000000000 +0000 -+++ halt 2010-03-24 18:12:36.000000000 +0000 -@@ -138,7 +138,7 @@ - $"Unmounting pipe file systems (retry): " \ - -f - --LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/dev/{next} -+LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/etc|^\/dev/{next} - $3 == "tmpfs" || $3 == "proc" {print $2 ; next} - /(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next} - {print $2}' /proc/mounts \ -EOF_halt - -# rhbz#675868 -# Modify rc.sysinit -patch -d /etc/rc.d -p0 << \EOF_rc_sysinit ---- rc.sysinit.orig 2012-09-11 09:41:22.545431354 +0530 -+++ rc.sysinit 2012-09-11 09:52:59.619523468 +0530 -@@ -43,7 +43,7 @@ - fi - - if [ -n "$SELINUX_STATE" -a -x /sbin/restorecon ] && __fgrep " /dev " /proc/mounts >/dev/null 2>&1 ; then -- /sbin/restorecon -R -F /dev 2>/dev/null -+ /sbin/restorecon -e /dev/.initramfs -R /dev 2>/dev/null - fi - - disable_selinux() { -EOF_rc_sysinit - -if grep -q 6.6 /etc/system-release; then - patch -d /etc/rc.d -p0 << \EOF_rc_sysinit -@@ -513,9 +513,9 @@ - # filesystems are NOT unmounted in single user mode. - # The 'no' applies to all listed filesystem types. See mount(8). - if [ "$READONLY" != "yes" ] ; then -- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs -O no_netdev -+ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,glusterfs,noproc,nosysfs,nodevpts -O no_netdev - else -- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs -O no_netdev -+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2i,glusterfs,noproc,nosysfs,nodevpts -O no_netdev - fi - - # Update quotas if necessary -EOF_rc_sysinit -else - patch -d /etc/rc.d -p0 << \EOF_rc_sysinit -@@ -497,9 +497,9 @@ - # filesystems are NOT unmounted in single user mode. - # The 'no' applies to all listed filesystem types. See mount(8). - if [ "$READONLY" != "yes" ] ; then -- action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev - else -- action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev -+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev - fi - - # Update quotas if necessary -EOF_rc_sysinit -fi - -# rhbz#675868 -# Modify start_udev -patch -d /sbin -p0 << \EOF_start_udev ---- start_udev.orig 2011-03-30 12:32:03.000000000 +0000 -+++ start_udev 2011-09-02 17:16:57.954610422 +0000 -@@ -121,7 +121,7 @@ - #/bin/chown root:root /dev/fuse - - if [ -x /sbin/restorecon ]; then -- /sbin/restorecon -R /dev -+ /sbin/restorecon -e /dev/.initramfs -R /dev - fi - - if [ -x "$MAKEDEV" ]; then -EOF_start_udev - -# rhbz#734478 add virt-who (*.py are removed in rhevh image) -cmd_who="" -if [ -f /usr/share/virt-who/virt-who.pyc ]; then - cmd_who="virt-who.pyc" -elif [ -f /usr/share/virt-who/virtwho.pyc ]; then - cmd_who="virtwho.pyc" -else - echo "Couldn't find a known virt-who executable. Please check" -fi - -if [ -z $cmd_who ]; then - echo "Found no virt-who module" -else - echo "Found virt-who, creating bin" - cat > /usr/bin/virt-who <<EOF_virt_who -#!/bin/sh -exec /usr/bin/python /usr/share/virt-who/$cmd_who "\$@" -EOF_virt_who - chmod a+x /usr/bin/virt-who -fi - -# rhbz 1209350 virt-who keeps using absolute paths to uncompiled -# python files. Change this to the compiled version as well, and -# persist the generated key file - -patch -d /bin -p0 << \EOF_virt_who_password ---- virt-who-password 2015-04-07 12:13:41.992000000 -0400 -+++ virt-who-password 2015-04-07 12:14:33.909000000 -0400 -@@ -1,10 +1,12 @@ - #!/bin/sh - --if [ -f ./virtwhopassword.py ]; -+if [ -f ./virtwhopassword.pyc ]; - then - # Run it from local directory when available -- exec /usr/bin/python ./virtwhopassword.py "$@" -+ /usr/bin/python ./virtwhopassword.pyc "$@" - else - # Run it from /usr/share/virt-who -- exec /usr/bin/python /usr/share/virt-who/virtwhopassword.py "$@" -+ /usr/bin/python /usr/share/virt-who/virtwhopassword.pyc "$@" - fi -+ -+persist /var/lib/virt-who/key -EOF_virt_who_password - -# set maxlogins to 3 -echo "* - maxlogins 3" >> /etc/security/limits.conf - -patch -d /etc/init.d -p0 << \EOF_functions ---- functions.orig 2014-01-03 21:22:50.061036793 -0500 -+++ functions 2014-01-03 21:22:06.169959322 -0500 -@@ -91,9 +91,9 @@ - remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) - while [ -n "$remaining" -a "$retry" -gt 0 ]; do - if [ "$retry" -eq 3 ]; then -- action "$3" fstab-decode umount $remaining -+ action "$3" fstab-decode umount -n $remaining - else -- action "$4" fstab-decode umount $5 $remaining -+ action "$4" fstab-decode umount -n $5 $remaining - fi - count=4 - remaining=$(LC_ALL=C awk "/^#/ {next} $1" "$2" | sort -r) -EOF_functions - -patch -d /sbin -p0 << \EOF_mkdumprd ---- mkdumprd.orig 2014-01-16 08:57:48.002090191 -0500 -+++ mkdumprd 2014-01-16 08:58:29.419306913 -0500 -@@ -3634,7 +3634,7 @@ - #test nfs mount and directory creation - rlocation=`echo $DUMP_TARGET | sed 's/.*:/'"$remoteip"':/'` - tmnt=`mktemp -dq` -- kdump_chk "mount -t $USING_METHOD -o nolock -o tcp $rlocation $tmnt" \ -+ kdump_chk "mount -n -t $USING_METHOD -o nolock -o tcp $rlocation $tmnt" \ - "Bad NFS mount $DUMP_TARGET" - kdump_chk "mkdir -p $tmnt/$SAVE_PATH" "Read only NFS mount $DUMP_TARGET" - kdump_chk "touch $tmnt/$SAVE_PATH/testfile" "Read only NFS mount $DUMP_TARGET" -@@ -3645,7 +3645,7 @@ - available_size=$(df -P $tdir | tail -1 | tr -s ' ' ':' | cut -d: -f5) - - rm -rf $tdir -- umount -f $tmnt -+ umount -n -f $tmnt - if [ $? != 0 ]; then - rmdir $tmnt - echo "Cannot unmount the temporary directory" -EOF_mkdumprd - -- To view, visit https://gerrit.ovirt.org/44827 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie551e173a1aef45bb62c13e3cdf8e01dc2621ac1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Anatoly Litovsky <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
