Fixes #35851 - Add parameter tftp_system_image_root

Co-authored-by: Ewoud Kohl van Wijngaarden <[email protected]>

Author: Bastian Schmidt

manifests/init.pp

@@ -120,6 +120,8 @@
 #
 # $tftp_replace_grub2_cfg::     Determines if grub2.cfg will be replaced
 #
+# $tftp_system_image_root::     TFTP system image root directory
+#
 # $dhcp::                       Enable DHCP feature
 #
 # $dhcp_listen_on::             DHCP proxy to listen on https, http, or both
@@ -345,6 +347,7 @@
   Boolean $tftp_managed = true,
   Boolean $tftp_manage_wget = true,
   Optional[Stdlib::Absolutepath] $tftp_root = $foreman_proxy::params::tftp_root,
+  Optional[Stdlib::Absolutepath] $tftp_system_image_root = $foreman_proxy::params::tftp_system_image_root,
   Optional[Array[Stdlib::Absolutepath]] $tftp_dirs = undef,
   Optional[String] $tftp_servername = undef,
   Boolean $tftp_replace_grub2_cfg = false,

manifests/module/tftp.pp

@@ -8,13 +8,19 @@
 #
 # @param tftproot
 #   The root directory to use. This is required if the module is enabled.
+#
+# @param tftp_system_image_root
+#   The system image root directory to use. This is required if the module
+#   is supposed to download and extract OS image files.
 class foreman_proxy::module::tftp (
   Boolean $enabled = $foreman_proxy::tftp,
   Foreman_proxy::ListenOn $listen_on = $foreman_proxy::tftp_listen_on,
   Optional[Stdlib::Absolutepath] $tftproot = $foreman_proxy::tftp_root,
+  Optional[Stdlib::Absolutepath] $tftp_system_image_root = $foreman_proxy::tftp_system_image_root,
 ) {
   if $enabled {
     assert_type(NotUndef, $tftproot)
+    assert_type(NotUndef, $tftp_system_image_root)
   }
 
   foreman_proxy::module { 'tftp':

manifests/params.pp

@@ -158,6 +158,7 @@
 
   # TFTP settings - requires optional TFTP puppet module
   $tftp_root = lookup('tftp::root', undef, undef, undef)
+  $tftp_system_image_root = '/var/lib/foreman-proxy/tftp/system_images'
 
   # DHCP settings - requires optional DHCP puppet module
   $dhcp_interface        = pick(fact('networking.primary'), 'eth0')

manifests/tftp.pp

@@ -3,6 +3,7 @@
 class foreman_proxy::tftp (
   String[1] $user = $foreman_proxy::user,
   Optional[Stdlib::Absolutepath] $root = $foreman_proxy::tftp_root,
+  Optional[Stdlib::Absolutepath] $tftp_system_image_root = $foreman_proxy::tftp_system_image_root,
   Optional[Array[Stdlib::Absolutepath]] $directories = $foreman_proxy::tftp_dirs,
   Array[Stdlib::Absolutepath] $syslinux_filenames = $foreman_proxy::params::tftp_syslinux_filenames,
   Boolean $manage_wget = $foreman_proxy::tftp_manage_wget,

spec/classes/foreman_proxy__spec.rb

@@ -278,6 +278,7 @@
             '---',
             ':enabled: false',
             ":tftproot: #{tftp_root}",
+            ':tftp_system_image_root: /var/lib/foreman-proxy/tftp/system_images',
           ])
         end
 
@@ -458,6 +459,7 @@
             '---',
             ':enabled: https',
             ":tftproot: #{tftp_root}",
+            ':tftp_system_image_root: /var/lib/foreman-proxy/tftp/system_images',
           ])
         end
 
@@ -486,7 +488,8 @@
               '---',
               ':enabled: https',
               ':tftproot: /tftproot',
-              ':tftp_servername: 127.0.1.1'
+              ':tftp_servername: 127.0.1.1',
+              ':tftp_system_image_root: /var/lib/foreman-proxy/tftp/system_images',
             ])
           end
         end

templates/tftp.yml.erb

@@ -4,3 +4,6 @@
 :tftproot: <%= scope.lookupvar("foreman_proxy::module::tftp::tftproot") %>
 # Defines the TFTP Servername to use, overrides the name in the subnet declaration
 <%= '#'  if [nil, :undefined, :undef].include?(scope.lookupvar("foreman_proxy::tftp_servername")) %>:tftp_servername: <%= scope.lookupvar("foreman_proxy::tftp_servername") %>
+
+# Defines the default folder to provide system images.
+:tftp_system_image_root: <%= scope.lookupvar("foreman_proxy::module::tftp::tftp_system_image_root") %>