openstack/fuel-main
Code Issues Proposed changes

LOCALBOOT changed to COM32 chain.c32 in pxelocal.template

Browse Source
This commit is contained in:
Vladimir Kozhukalov 2013-01-17 13:49:47 +04:00
parent 17919f84f4
commit fd8b41cc6a
3 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iso/bootstrap_admin_node.conf
View File

@ -11,7 +11,7 @@ script
. /etc/sysconfig/bootstrap_admin_node . /etc/sysconfig/bootstrap_admin_node
if test "${ENABLED}" = "1"; then if test "${ENABLED}" = "1"; then
echo "ENABLED=0" > /etc/sysconfig/bootstrap_admin_node echo "ENABLED=0" > /etc/sysconfig/bootstrap_admin_node
/usr/local/sbin/bootstrap_admin_node.sh | tee /var/log/puppet/bootstrap_admin_node.log /usr/local/sbin/bootstrap_admin_node.sh 2>&1 | tee /var/log/puppet/bootstrap_admin_node.log
fi fi
initctl start tty TTY=/dev/tty1 initctl start tty TTY=/dev/tty1
end script end script

10
puppet/cobbler/manifests/server.pp
View File

@ -279,6 +279,16 @@ class cobbler::server(
], ],
} }
exec { "/var/lib/tftpboot/chain.c32":
command => "cp /usr/share/syslinux/chain.c32 /var/lib/tftpboot/chain.c32",
unless => "test -e /var/lib/tftpboot/chain.c32",
require => [
Package[$cobbler_additional_packages],
Package[$cobbler_package],
]
}
define cobbler_snippet(){ define cobbler_snippet(){
file {"/var/lib/cobbler/snippets/${name}": file {"/var/lib/cobbler/snippets/${name}":
content => template("cobbler/snippets/${name}.erb"), content => template("cobbler/snippets/${name}.erb"),

4
puppet/cobbler/templates/pxelocal.template.erb
View File

@ -6,5 +6,7 @@ ONTIMEOUT local
LABEL local LABEL local
# 0x80 works in VirtualBox -1 is the default one # 0x80 works in VirtualBox -1 is the default one
LOCALBOOT 0x80 # LOCALBOOT 0x80
# LOCALBOOT -1 # LOCALBOOT -1
COM32 chain.c32
APPEND hd0