Douglas Schilling Landgraf has uploaded a new change for review. Change subject: recipe: centos7 post/minimizer type changed ......................................................................
recipe: centos7 post/minimizer type changed RHEV-H 7 might contain particular changes that Centos7 node doesn't need, like Centos6 vs RHEV-H 6. This patch removes the symbol link of minimizer.ks and post.ks from centos7 pointing to rhevh7 and creates it's own files. Change-Id: Id58544bd37d6841b62286c9e48e50665eee4e868 Signed-off-by: Douglas Schilling Landgraf <[email protected]> --- D recipe/centos7-minimizer.ks A recipe/centos7-minimizer.ks D recipe/centos7-post.ks A recipe/centos7-post.ks 4 files changed, 266 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/63/39463/1 diff --git a/recipe/centos7-minimizer.ks b/recipe/centos7-minimizer.ks deleted file mode 120000 index 0edd319..0000000 --- a/recipe/centos7-minimizer.ks +++ /dev/null @@ -1 +0,0 @@ -rhevh7-minimizer.ks \ No newline at end of file diff --git a/recipe/centos7-minimizer.ks b/recipe/centos7-minimizer.ks new file mode 100644 index 0000000..e2ef3cb --- /dev/null +++ b/recipe/centos7-minimizer.ks @@ -0,0 +1,7 @@ +# 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/centos7-post.ks b/recipe/centos7-post.ks deleted file mode 120000 index 136f749..0000000 --- a/recipe/centos7-post.ks +++ /dev/null @@ -1 +0,0 @@ -rhevh7-post.ks \ No newline at end of file diff --git a/recipe/centos7-post.ks b/recipe/centos7-post.ks new file mode 100644 index 0000000..f073b9a --- /dev/null +++ b/recipe/centos7-post.ks @@ -0,0 +1,259 @@ +%include version.ks + +# patch kdumpctl so "net" still works for now +# can remove when rhbz#1139298 lands +# rhbz#1095140 +patch -d /bin -p0 << \EOF_kdump +--- kdumpctl 2014-09-28 17:24:41.744858571 +0000 ++++ kdumpctl 2014-09-28 17:24:28.251942734 +0000 +@@ -242,7 +242,7 @@ + case "$config_opt" in + #* | "") + ;; +- raw|ext2|ext3|ext4|minix|btrfs|xfs|nfs|ssh|sshkey|path|core_collector|kdump_post|kdump_pre|extra_bins|extra_modules|default|force_rebuild|dracut_args|fence_kdump_args|fence_kdump_nodes) ++ raw|ext2|ext3|ext4|minix|btrfs|xfs|nfs|net|ssh|sshkey|path|core_collector|kdump_post|kdump_pre|extra_bins|extra_modules|default|force_rebuild|dracut_args|fence_kdump_args|fence_kdump_nodes) + [ -z "$config_val" ] && { + echo "Invalid kdump config value for option $config_opt." + return 1; +@@ -476,6 +476,9 @@ + ssh) + DUMP_TARGET=$config_val + ;; ++ net) ++ DUMP_TARGET=$config_val ++ ;; + *) + ;; + esac +EOF_kdump + +# include dmsquash-live in dracut for kdump +sed -ie 's/^#add_dracutmodules+=""/add_dracutmodules+="dmsquash-live"/' /etc/dracut.conf + +# Make dmsquash-live able to be included on hostonly configurations +patch -d /usr/lib/dracut/modules.d/90dmsquash-live -p0 << \EOF_dmsquash +--- module-setup.sh 2015-01-13 07:29:57.907325412 -0700 ++++ module-setup.sh 2015-01-13 07:30:08.900364143 -0700 +@@ -3,8 +3,6 @@ + # ex: ts=8 sw=4 sts=4 et filetype=sh + + check() { +- # a live host-only image doesn't really make a lot of sense +- [[ $hostonly ]] && return 1 + return 255 + } +EOF_dmsquash + +# add RHEV-H rwtab locations +mkdir -p /rhev +cat > /etc/rwtab.d/rhev << EOF_RWTAB_RHEVH +dirs /var/db +EOF_RWTAB_RHEVH + +# disable lvmetad rhbz#1147217 +# Since we can't be sure of what values the LVM developers will use in the +# future or whether they'll comment out configuration and leave it to defaults, +# be as judicious as possible. Current defaults are in the format +# "^\s*#\s*option", so try to match that and strip off the comment if it's +# commented by default +# +# See thin_check_executable in lvm.conf(as of 20140101) for an example of +# possible defaults +# +# Match any whitespace with an optional #, then grab anything after that to +# use as a backreference +sed -ie 's/^\(\s*\)#*\(\s*use_lvmetad\)\s*=\s*[[:digit:]]\+/\1\2 = 0/' \ + /etc/lvm/lvm.conf + +enabled=$(grep -q -E '^\s*use_lvmetad = 0$' /etc/lvm/lvm.conf) +if [ -n "$enabled" ]; then + echo -e "lvmetad not disabled. use_lvmetad appears in lvm.conf at:\n" + # Grab every instance in the file just in case for for output to see if + # recommended usage has changed in the comments or the option disappeared + # or other + grep -E 'use_lvmetad' /etc/lvm/lvm.conf + exit 1 +fi + +systemctl disable lvm2-lvmetad +systemctl disable lvm2-lvmetad.socket + +# Disable ksmtuned, becuase it conflicts with vdsmd +# https://bugzilla.redhat.com/show_bug.cgi?id=1156369 +systemctl disable ksmtuned.service +systemctl disable ksm.service + +# 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 "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 +# 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 +# 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 +# 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 + +# bz#1128523 - replace dirs with files to keep everything below /var/lib/puppet +sed -ie 's/dirs[ \t]\+\(.*puppet\)//1' /etc/rwtab +echo "files /var/lib/puppet" >> /etc/rwtab + +# bz#1095138 - replace dirs with files to keep everything below /var/lib/nfs +sed -ie '/dirs[ \t].*nfs/ d' /etc/rwtab +echo "files /var/lib/nfs" >> /etc/rwtab + +# 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 + cat > /usr/bin/virt-who <<EOF_virt_who +#!/bin/sh +exec /usr/bin/python /usr/share/virt-who/$cmd_who "\$@" +EOF_virt_who +fi + +# rhbz 1152947 fixing virt-who start dependancy syslog.socket +# first of all fixing the missing link of syslog to rsyslog +# depending service and socket for correct operation + +sed -i "s/syslog\.target/syslog.socket/" /usr/lib/systemd/system/virt-who.service +sed -i "s/;Requires/Requires/" /lib/systemd/system/rsyslog.service +ln -s /lib/systemd/system/rsyslog.service /etc/systemd/system/syslog.service + +#enabling libvirtd as described in its libvirtd.service comments and virt-who as requested in bug +systemctl enable libvirtd.service +systemctl enable virt-who.service + +# set maxlogins to 3 +echo "* - maxlogins 3" >> /etc/security/limits.conf + +# dracut config +cat <<_EOF_ > /etc/dracut.conf.d/ovirt-node.conf + +add_dracutmodules+=" dmsquash-live " + +_EOF_ + +# udev patch for rhbz#1152948 +patch --ignore-whitespace -d /lib/udev/rules.d -p0 << \EOF_udev_patch +--- 62-multipath.rules.orig 2014-11-04 14:57:12.385999154 +0000 ++++ 62-multipath.rules 2014-11-04 14:58:19.081002175 +0000 +@@ -45,5 +45,5 @@ + ENV{DM_UUID}!="mpath-?*", GOTO="end_mpath" + ENV{DM_SUSPENDED}=="1", GOTO="end_mpath" + ENV{DM_ACTION}=="PATH_FAILED", GOTO="end_mpath" +-RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode" ++ENV{DM_ACTIVATION}=="1", RUN+="$env{MPATH_SBIN_PATH}/kpartx -a $tempnode" + LABEL="end_mpath" +EOF_udev_patch + +patch --ignore-whitespace -d /usr/lib/dracut/ -p0 << \EOF_dracut +--- modules.d/90dmsquash-live/dmsquash-live-genrules.sh ++++ modules.d/90dmsquash-live/dmsquash-live-genrules.sh +@@ -3,10 +3,10 @@ + case "$root" in + live:/dev/*) + { +- printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ +- ${root#live:/dev/} +- printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root $env{DEVNAME}"\n' \ +- ${root#live:/dev/} ++ printf 'KERNEL=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root %s"\n' \ ++ "${root#live:/dev/}" "${root#live:}" ++ printf 'SYMLINK=="%s", RUN+="/sbin/initqueue --settled --onetime --unique /sbin/dmsquash-live-root %s"\n' \ ++ "${root#live:/dev/}" "${root#live:}" + } >> /etc/udev/rules.d/99-live-squash.rules + wait_for_dev -n "${root#live:}" + ;; +EOF_dracut + +# rhbz 1162699 setting correct theme +/usr/sbin/plymouth-set-default-theme text +rm -rf /var/lib/sfcb/registration/repository.previous/root/virt + +# rhbz 1181987 removing plymouth dracut message +sed -i 's/ln -sf initrd-release $initdir\/etc\/os-release/cp \/etc\/os-release $initdir\/etc\//' /lib/dracut/modules.d/99base/module-setup.sh + -- To view, visit https://gerrit.ovirt.org/39463 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id58544bd37d6841b62286c9e48e50665eee4e868 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-node Gerrit-Branch: master Gerrit-Owner: Douglas Schilling Landgraf <[email protected]> _______________________________________________ node-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/node-patches
