Merge "Revert "Use HTTP to download kernel and initital RAM disk""
This commit is contained in:
commit
fb3a897c40
|
@ -147,7 +147,7 @@ class cobbler::server (
|
|||
'/var/lib/fuel/keys',
|
||||
'/var/lib/fuel/keys/master',
|
||||
'/var/lib/fuel/keys/master/cobbler',
|
||||
]:
|
||||
]:
|
||||
ensure => 'directory',
|
||||
}
|
||||
file { '/etc/httpd/conf.d/nailgun.conf':
|
||||
|
@ -199,15 +199,6 @@ class cobbler::server (
|
|||
notify => Service[$cobbler_web_service],
|
||||
}
|
||||
|
||||
file { '/etc/httpd/conf.d/cobbler-tftp.conf':
|
||||
content => template('cobbler/cobbler-tftp.conf.erb'),
|
||||
owner => 'root',
|
||||
group => 'root',
|
||||
mode => '0644',
|
||||
require => File['/etc/httpd/conf.d/'],
|
||||
notify => Service[$cobbler_web_service],
|
||||
}
|
||||
|
||||
service { $cobbler_web_service:
|
||||
ensure => running,
|
||||
enable => true,
|
||||
|
|
|
@ -1,8 +0,0 @@
|
|||
Alias /cobbler/boot /var/lib/tftpboot
|
||||
|
||||
<Directory /var/lib/tftpboot>
|
||||
Options +Indexes +FollowSymLinks
|
||||
AllowOverride None
|
||||
Order allow,deny
|
||||
Allow from all
|
||||
</Directory>
|
|
@ -2,4 +2,3 @@
|
|||
dhcp-range=<%= @range_name %>,<%= @dhcp_start_address %>,<%= @dhcp_end_address %>,<%= @dhcp_netmask %>,<%= @lease_time %>
|
||||
dhcp-option=net:<%= @range_name %>,option:router,<%= @dhcp_gateway %>
|
||||
dhcp-boot=net:<%= @range_name %>,pxelinux.0,boothost,<%= @next_server %>
|
||||
dhcp-option-force=210,http://<%= @next_server %>/cobbler/boot/
|
||||
|
|
Loading…
Reference in New Issue