bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
63 lines
2.5 KiB
Diff
63 lines
2.5 KiB
Diff
From 017e2ed0c664fb8689f6a9c4352db740c2c39725 Mon Sep 17 00:00:00 2001
|
|
From: Don Penney <don.penney@windriver.com>
|
|
Date: Thu, 15 Sep 2016 16:49:48 -0400
|
|
Subject: [PATCH] Support management of tftp_max option
|
|
|
|
---
|
|
packstack/puppet/modules/dnsmasq/manifests/init.pp | 4 ++++
|
|
packstack/puppet/modules/dnsmasq/manifests/params.pp | 1 +
|
|
packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb | 3 +++
|
|
3 files changed, 8 insertions(+)
|
|
|
|
diff --git a/packstack/puppet/modules/dnsmasq/manifests/init.pp b/packstack/puppet/modules/dnsmasq/manifests/init.pp
|
|
index c61fd94..b66ac17 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/manifests/init.pp
|
|
+++ b/packstack/puppet/modules/dnsmasq/manifests/init.pp
|
|
@@ -328,6 +328,9 @@
|
|
# Enable dnsmasq's built-in TFTP server
|
|
# Default: false
|
|
#
|
|
+# [*tftp_max*]
|
|
+# Max tftp connections
|
|
+#
|
|
# [*tftp_secure*]
|
|
# Make the TFTP server more secure: with this set, only files owned by
|
|
# the user dnsmasq is running as will be send over the net.
|
|
@@ -476,6 +479,7 @@ class dnsmasq (
|
|
$pxe_prompt_timeout = params_lookup( 'pxe_prompt_timeout' ),
|
|
$pxe_service = params_lookup( 'pxe_service' ),
|
|
$enable_tftp = params_lookup( 'enable_tftp' ),
|
|
+ $tftp_max = params_lookup( 'tftp_max' ),
|
|
$tftp_secure = params_lookup( 'tftp_secure' ),
|
|
$tftp_root = params_lookup( 'tftp_root' ),
|
|
$dhcp_lease_max = params_lookup( 'dhcp_lease_max' ),
|
|
diff --git a/packstack/puppet/modules/dnsmasq/manifests/params.pp b/packstack/puppet/modules/dnsmasq/manifests/params.pp
|
|
index 6129b57..845e91e 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/manifests/params.pp
|
|
+++ b/packstack/puppet/modules/dnsmasq/manifests/params.pp
|
|
@@ -103,6 +103,7 @@ class dnsmasq::params {
|
|
$pxe_prompt_timeout = '60'
|
|
$pxe_service = ''
|
|
$enable_tftp = false
|
|
+ $tftp_max = ''
|
|
$tftp_secure = false
|
|
$tftp_root = ''
|
|
$dhcp_lease_max = ''
|
|
diff --git a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
|
|
index ea5aa01..6a6cbdf 100644
|
|
--- a/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
|
|
+++ b/packstack/puppet/modules/dnsmasq/templates/dnsmasq.conf.erb
|
|
@@ -60,6 +60,9 @@ pxe-service=<%= scope.lookupvar('dnsmasq::pxe_service') %>
|
|
<% if scope.lookupvar('dnsmasq::bool_enable_tftp') -%>
|
|
enable-tftp
|
|
<% end -%>
|
|
+<% if scope.lookupvar('dnsmasq::tftp_max') != '' -%>
|
|
+tftp-max=<%= scope.lookupvar('dnsmasq::tftp_max') %>
|
|
+<% end -%>
|
|
<% if scope.lookupvar('dnsmasq::bool_tftp_secure') -%>
|
|
tftp-secure
|
|
<% end -%>
|
|
--
|
|
1.8.3.1
|
|
|