Merge "Debian/Ubuntu: Use tftpd-hpa instead of tftpd" into stable/xena

manifests/params.pp

@@ -86,7 +86,7 @@ class ironic::params {
       $ironic_wsgi_script_path   = '/usr/lib/cgi-bin/ironic'
       $ironic_wsgi_script_source = '/usr/bin/ironic-api-wsgi'
       $xinetd_available          = true
-      $tftpd_package             = 'tftpd'
+      $tftpd_package             = 'tftpd-hpa'
       $ipxe_package              = 'ipxe'
       $syslinux_package          = 'syslinux-common'
       if ($::os_package_type == 'debian') {

releasenotes/notes/use-tftpd-hpa-in-debian-07f5429e791ab883.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Now the ``tftpd-hap`` package is installed insted of the ``tftpd`` package
+    in Debian and Ubuntu.

spec/classes/ironic_pxe_spec.rb

@@ -168,6 +168,7 @@ describe 'ironic::pxe' do
     it 'should install tftp-server package' do
       is_expected.to contain_package('tftp-server').with(
         'ensure' => 'present',
+        'name'   => platform_params[:tftp_package]
       )
     end
 
@@ -267,6 +268,7 @@ describe 'ironic::pxe' do
           {
             :ipxe_package     => 'ipxe',
             :syslinux_package => 'syslinux-common',
+            :tftp_package     => 'tftpd-hpa',
           }
         when 'RedHat'
           {
@@ -274,6 +276,7 @@ describe 'ironic::pxe' do
             :dnsmasq_tftp_service => 'openstack-ironic-dnsmasq-tftp-server',
             :ipxe_package         => 'ipxe-bootimgs',
             :syslinux_package     => 'syslinux-tftpboot',
+            :tftp_package         => 'tftp-server',
           }
         end
       end