From c0122b74946aaaa03d6d9fc65e02c191ad4c681d Mon Sep 17 00:00:00 2001
From: Derek Higgins <derekh@redhat.com>
Date: Fri, 15 Dec 2017 11:57:49 +0000
Subject: [PATCH] Add an option to specify the tftp bind host IP

Change-Id: Iea204fe993ecc9e3a273491c083e06a78ee0e19d
---
 manifests/pxe.pp                                      | 6 ++++++
 releasenotes/notes/tftp-bind-ip-0a042cd836dd53f9.yaml | 4 ++++
 spec/classes/ironic_pxe_spec.rb                       | 6 ++++++
 3 files changed, 16 insertions(+)
 create mode 100644 releasenotes/notes/tftp-bind-ip-0a042cd836dd53f9.yaml

diff --git a/manifests/pxe.pp b/manifests/pxe.pp
index 797391f4..0f1cd5b7 100644
--- a/manifests/pxe.pp
+++ b/manifests/pxe.pp
@@ -43,6 +43,10 @@
 #   (optional) Array of PXE boot files to copy from $syslinux_path to $tftp_root.
 #   Defaults to '$::ironic::params::syslinux_files'
 #
+# [*tftp_bind_host*]
+#   (optional) The IP address xinetd will listen on for TFTP.
+#   Defaults to undef (listen on all ip addresses).
+#
 class ironic::pxe (
   $package_ensure = 'present',
   $tftp_root      = '/tftpboot',
@@ -50,6 +54,7 @@ class ironic::pxe (
   $http_port      = '8088',
   $syslinux_path  = $::ironic::params::syslinux_path,
   $syslinux_files = $::ironic::params::syslinux_files,
+  $tftp_bind_host = undef,
 ) inherits ::ironic::params {
 
   include ::ironic::deps
@@ -101,6 +106,7 @@ class ironic::pxe (
 
   xinetd::service { 'tftp':
     port        => '69',
+    bind        => $tftp_bind_host,
     protocol    => 'udp',
     server_args => "${options} ${tftp_root_real}",
     server      => '/usr/sbin/in.tftpd',
diff --git a/releasenotes/notes/tftp-bind-ip-0a042cd836dd53f9.yaml b/releasenotes/notes/tftp-bind-ip-0a042cd836dd53f9.yaml
new file mode 100644
index 00000000..ce80b2ac
--- /dev/null
+++ b/releasenotes/notes/tftp-bind-ip-0a042cd836dd53f9.yaml
@@ -0,0 +1,4 @@
+---
+features:
+  - New option "tftp_bind_host" added to specify
+    IP address TFTP will bind too
diff --git a/spec/classes/ironic_pxe_spec.rb b/spec/classes/ironic_pxe_spec.rb
index 936577eb..3ce617ac 100644
--- a/spec/classes/ironic_pxe_spec.rb
+++ b/spec/classes/ironic_pxe_spec.rb
@@ -76,6 +76,7 @@ describe 'ironic::pxe' do
           :tftp_root => '/var/lib/tftpboot',
           :http_root => '/var/www/httpboot',
           :http_port => 3816,
+          :tftp_bind_host => '1.2.3.4',
         )
       end
 
@@ -119,6 +120,11 @@ describe 'ironic::pxe' do
           'backup'  => false,
         )
       end
+      it 'should setup tftp xinetd service' do
+        is_expected.to contain_xinetd__service('tftp').with(
+         'bind' => '1.2.3.4',
+        )
+      end
     end
     context 'when excluding syslinux' do
       before :each do