Due to a critical dracut bug, and a strong dev focus on F16, we're
dropping all F15 recipes.
Signed-off-by: Mike Burns <mburns at redhat.com>
---
recipe/ovirt15-install.ks | 1 -
recipe/ovirt15-minimizer.ks | 1 -
recipe/ovirt15-pkgs.ks | 2 -
recipe/ovirt15-post.ks | 145 ------------------------------------------
recipe/ovirt16-install.ks | 2 +-
recipe/ovirt16-minimizer.ks | 2 +-
recipe/ovirt16-post.ks | 146 ++++++++++++++++++++++++++++++++++++++++++-
7 files changed, 147 insertions(+), 152 deletions(-)
delete mode 100644 recipe/ovirt15-install.ks
delete mode 100644 recipe/ovirt15-minimizer.ks
delete mode 100644 recipe/ovirt15-pkgs.ks
delete mode 100644 recipe/ovirt15-post.ks
mode change 120000 => 100644 recipe/ovirt16-install.ks
mode change 120000 => 100644 recipe/ovirt16-minimizer.ks
mode change 120000 => 100644 recipe/ovirt16-post.ks
diff --git a/recipe/ovirt15-install.ks b/recipe/ovirt15-install.ks
deleted file mode 100644
index 2265550..0000000
--- a/recipe/ovirt15-install.ks
+++ /dev/null
@@ -1 +0,0 @@
-services
--enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,anyterm,collectd,libvirt-qpid,matahari-host
diff --git a/recipe/ovirt15-minimizer.ks b/recipe/ovirt15-minimizer.ks
deleted file mode 100644
index 413c646..0000000
--- a/recipe/ovirt15-minimizer.ks
+++ /dev/null
@@ -1 +0,0 @@
-# Fedora specific image minimization
diff --git a/recipe/ovirt15-pkgs.ks b/recipe/ovirt15-pkgs.ks
deleted file mode 100644
index d9c609f..0000000
--- a/recipe/ovirt15-pkgs.ks
+++ /dev/null
@@ -1,2 +0,0 @@
-%include fedora-pkgs.ks
-matahari-net
diff --git a/recipe/ovirt15-post.ks b/recipe/ovirt15-post.ks
deleted file mode 100644
index 16e4131..0000000
--- a/recipe/ovirt15-post.ks
+++ /dev/null
@@ -1,145 +0,0 @@
-# ovirt-install-node-stateless
-# ovirt_setup_libvirtd()
- # just to get a boot warning to shut up
- touch /etc/resolv.conf
-
- # make libvirtd listen on the external interfaces
- sed -i -e 's/^#\(LIBVIRTD_ARGS="--listen"\).*/\1/' \
- /etc/sysconfig/libvirtd
-
- # 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
- # set up libvirtd to listen on TCP (for kerberos)
- sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 =
1/" \
- -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/"
\
- /etc/libvirt/libvirtd.conf
-
- # with libvirt (0.4.0), make sure we we setup gssapi in the mech_list
- sasl_conf=/etc/sasl2/libvirt.conf
- if ! grep -qE "^mech_list: gssapi" $sasl_conf ; then
- sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" $sasl_conf
- echo "mech_list: gssapi" >> $sasl_conf
- fi
-
-#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
-
-# rwtab changes from upstream
-patch -d /etc/ -p1 << \EOF_PATCH
-diff --git a/rwtab b/rwtab
-index cfcb814..7dcb846 100644
---- a/rwtab
-+++ b/rwtab
-@@ -1,9 +1,7 @@
- dirs /var/cache/man
- dirs /var/gdm
- dirs /var/lib/xkb
--dirs /var/lock
- dirs /var/log
--dirs /var/run
- dirs /var/puppet
- dirs /var/lib/dbus
- dirs /var/lib/nfs
-@@ -25,7 +23,6 @@ empty /var/lib/pulse
- empty /var/lib/ups
- empty /var/tmp
- empty /var/tux
--empty /media
-
- files /etc/adjtime
- files /etc/ntp.conf
-EOF_PATCH
-
-# 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
-
-# setup ovirt-firstboot multi-user dependency
-cat >> /lib/systemd/system/ovirt-firstboot.service <<
\EOF_firstboot
-[Unit]
-Description=firstboot configuration program (text mode)
-After=livesys.service plymouth-quit.service
-Before=systemd-user-sessions.service
-
-[Service]
-Environment=RUNLEVEL=3
-ExecStart=/etc/init.d/ovirt-firstboot start
-TimeoutSec=0
-RemainAfterExit=yes
-Type=oneshot
-SysVStartPriority=99
-StandardInput=tty
-
-[Install]
-WantedBy=multi-user.target
-EOF_firstboot
-
-systemctl enable ovirt-firstboot.service >/dev/null 2>&1
-
-
-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
--A INPUT -p tcp --dport 16509 -j ACCEPT
-# libvirt-cim
--A INPUT -p tcp --dport 5989 -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
--A INPUT -p tcp --dport 16509 -j ACCEPT
-# libvirt-cim
--A INPUT -p tcp --dport 5989 -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
diff --git a/recipe/ovirt16-install.ks b/recipe/ovirt16-install.ks
deleted file mode 120000
index beae07f..0000000
--- a/recipe/ovirt16-install.ks
+++ /dev/null
@@ -1 +0,0 @@
-ovirt15-install.ks
\ No newline at end of file
diff --git a/recipe/ovirt16-install.ks b/recipe/ovirt16-install.ks
new file mode 100644
index 0000000..2265550
--- /dev/null
+++ b/recipe/ovirt16-install.ks
@@ -0,0 +1 @@
+services
--enabled=auditd,ntpd,ntpdate,iptables,network,rsyslog,multipathd,snmpd,ovirt-early,ovirt,ovirt-post,anyterm,collectd,libvirt-qpid,matahari-host
diff --git a/recipe/ovirt16-minimizer.ks b/recipe/ovirt16-minimizer.ks
deleted file mode 120000
index fab6e8b..0000000
--- a/recipe/ovirt16-minimizer.ks
+++ /dev/null
@@ -1 +0,0 @@
-ovirt15-minimizer.ks
\ No newline at end of file
diff --git a/recipe/ovirt16-minimizer.ks b/recipe/ovirt16-minimizer.ks
new file mode 100644
index 0000000..413c646
--- /dev/null
+++ b/recipe/ovirt16-minimizer.ks
@@ -0,0 +1 @@
+# Fedora specific image minimization
diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks
deleted file mode 120000
index 624a987..0000000
--- a/recipe/ovirt16-post.ks
+++ /dev/null
@@ -1 +0,0 @@
-ovirt15-post.ks
\ No newline at end of file
diff --git a/recipe/ovirt16-post.ks b/recipe/ovirt16-post.ks
new file mode 100644
index 0000000..16e4131
--- /dev/null
+++ b/recipe/ovirt16-post.ks
@@ -0,0 +1,145 @@
+# ovirt-install-node-stateless
+# ovirt_setup_libvirtd()
+ # just to get a boot warning to shut up
+ touch /etc/resolv.conf
+
+ # make libvirtd listen on the external interfaces
+ sed -i -e 's/^#\(LIBVIRTD_ARGS="--listen"\).*/\1/' \
+ /etc/sysconfig/libvirtd
+
+ # 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
+ # set up libvirtd to listen on TCP (for kerberos)
+ sed -i -e "s/^[[:space:]]*#[[:space:]]*\(listen_tcp\)\>.*/\1 =
1/" \
+ -e "s/^[[:space:]]*#[[:space:]]*\(listen_tls\)\>.*/\1 = 0/"
\
+ /etc/libvirt/libvirtd.conf
+
+ # with libvirt (0.4.0), make sure we we setup gssapi in the mech_list
+ sasl_conf=/etc/sasl2/libvirt.conf
+ if ! grep -qE "^mech_list: gssapi" $sasl_conf ; then
+ sed -i -e "s/^\([[:space:]]*mech_list.*\)/#\1/" $sasl_conf
+ echo "mech_list: gssapi" >> $sasl_conf
+ fi
+
+#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
+
+# rwtab changes from upstream
+patch -d /etc/ -p1 << \EOF_PATCH
+diff --git a/rwtab b/rwtab
+index cfcb814..7dcb846 100644
+--- a/rwtab
++++ b/rwtab
+@@ -1,9 +1,7 @@
+ dirs /var/cache/man
+ dirs /var/gdm
+ dirs /var/lib/xkb
+-dirs /var/lock
+ dirs /var/log
+-dirs /var/run
+ dirs /var/puppet
+ dirs /var/lib/dbus
+ dirs /var/lib/nfs
+@@ -25,7 +23,6 @@ empty /var/lib/pulse
+ empty /var/lib/ups
+ empty /var/tmp
+ empty /var/tux
+-empty /media
+
+ files /etc/adjtime
+ files /etc/ntp.conf
+EOF_PATCH
+
+# 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
+
+# setup ovirt-firstboot multi-user dependency
+cat >> /lib/systemd/system/ovirt-firstboot.service <<
\EOF_firstboot
+[Unit]
+Description=firstboot configuration program (text mode)
+After=livesys.service plymouth-quit.service
+Before=systemd-user-sessions.service
+
+[Service]
+Environment=RUNLEVEL=3
+ExecStart=/etc/init.d/ovirt-firstboot start
+TimeoutSec=0
+RemainAfterExit=yes
+Type=oneshot
+SysVStartPriority=99
+StandardInput=tty
+
+[Install]
+WantedBy=multi-user.target
+EOF_firstboot
+
+systemctl enable ovirt-firstboot.service >/dev/null 2>&1
+
+
+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
+-A INPUT -p tcp --dport 16509 -j ACCEPT
+# libvirt-cim
+-A INPUT -p tcp --dport 5989 -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
+-A INPUT -p tcp --dport 16509 -j ACCEPT
+# libvirt-cim
+-A INPUT -p tcp --dport 5989 -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
--
1.7.4.4
