1 From 017e2ed0c664fb8689f6a9c4352db740c2c39725 Mon Sep 17 00:00:00 2001
2 From: Don Penney <don.penney@windriver.com>
3 Date: Thu, 15 Sep 2016 16:49:48 -0400
4 Subject: [PATCH] Support management of tftp_max option
7 packstack/puppet/modules/dnsmasq/manifests/init.pp | 4 ++++
8 packstack/puppet/modules/dnsmasq/manifests/params.pp | 1 +
9 packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb | 3 +++
10 3 files changed, 8 insertions(+)
12 diff --git a/packstack/puppet/modules/dnsmasq/manifests/init.pp b/packstack/puppet/modules/dnsmasq/manifests/init.pp
13 index c61fd94..b66ac17 100644
14 --- a/packstack/puppet/modules/dnsmasq/manifests/init.pp
15 +++ b/packstack/puppet/modules/dnsmasq/manifests/init.pp
17 # Enable dnsmasq's built-in TFTP server
21 +# Max tftp connections
24 # Make the TFTP server more secure: with this set, only files owned by
25 # the user dnsmasq is running as will be send over the net.
26 @@ -476,6 +479,7 @@ class dnsmasq (
27 $pxe_prompt_timeout = params_lookup( 'pxe_prompt_timeout' ),
28 $pxe_service = params_lookup( 'pxe_service' ),
29 $enable_tftp = params_lookup( 'enable_tftp' ),
30 + $tftp_max = params_lookup( 'tftp_max' ),
31 $tftp_secure = params_lookup( 'tftp_secure' ),
32 $tftp_root = params_lookup( 'tftp_root' ),
33 $dhcp_lease_max = params_lookup( 'dhcp_lease_max' ),
34 diff --git a/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
35 index 6129b57..845e91e 100644
36 --- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
37 +++ b/packstack/puppet/modules/dnsmasq/manifests/params.pp
38 @@ -103,6 +103,7 @@ class dnsmasq::params {
39 $pxe_prompt_timeout = '60'
46 diff --git a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
47 index ea5aa01..6a6cbdf 100644
48 --- a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
49 +++ b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
50 @@ -60,6 +60,9 @@ pxe-service=<%= scope.lookupvar('dnsmasq::pxe_service') %>
51 <% if scope.lookupvar('dnsmasq::bool_enable_tftp') -%>
54 +<% if scope.lookupvar('dnsmasq::tftp_max') != '' -%>
55 +tftp-max=<%= scope.lookupvar('dnsmasq::tftp_max') %>
57 <% if scope.lookupvar('dnsmasq::bool_tftp_secure') -%>