bind9: Make rndc options optional
rndc_config_file and rndc_key_file are not required in every deployment because designate override the minimum options such as host or port when running the rndc command. Drop the hard-coded default so that users don't have to create these files although one/both of these are unused. Change-Id: Ibb1caf04b1a911b1a83c625c61510631d9c672da
This commit is contained in:
@@ -6,11 +6,11 @@
|
||||
#
|
||||
# [*rndc_config_file*]
|
||||
# (Optional) Location of the rndc configuration file.
|
||||
# Defaults to '/etc/rndc.conf'
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*rndc_key_file*]
|
||||
# (Optional) Location of the rndc key file.
|
||||
# Defaults to '/etc/rndc.key'
|
||||
# Defaults to undef
|
||||
#
|
||||
# [*rndc_port*]
|
||||
# (Optional) RNDC Port.
|
||||
@@ -67,10 +67,10 @@
|
||||
# Defaults to undef
|
||||
#
|
||||
class designate::backend::bind9 (
|
||||
$rndc_config_file = '/etc/rndc.conf',
|
||||
$rndc_key_file = '/etc/rndc.key',
|
||||
$rndc_config_file = undef,
|
||||
$rndc_key_file = undef,
|
||||
$rndc_controls = undef,
|
||||
$rndc_port = 953,
|
||||
$rndc_port = undef,
|
||||
Hash[Integer, String] $ns_records = {1 => 'ns1.example.org.'},
|
||||
Array[String[1], 1] $nameservers = ['127.0.0.1'],
|
||||
Array[String[1], 1] $bind9_hosts = ['127.0.0.1'],
|
||||
|
||||
8
releasenotes/notes/rndc-optional-303e6561b611d0d1.yaml
Normal file
8
releasenotes/notes/rndc-optional-303e6561b611d0d1.yaml
Normal file
@@ -0,0 +1,8 @@
|
||||
---
|
||||
upgrade:
|
||||
- |
|
||||
Now the ``rndc_config_file`` option and the ``rndc_key_file`` of BIND9
|
||||
backend are not set by default, to avoid unnecessarily require these
|
||||
files.
|
||||
Set the parameters of the ``desingate::backend::bind9`` class in case
|
||||
the previous default values need to be used.
|
||||
@@ -37,9 +37,15 @@
|
||||
host: <%= bind9_host %>
|
||||
port: <%= @dns_port.to_s %>
|
||||
rndc_host: <%= bind9_host %>
|
||||
<% if !@rndc_port.nil? -%>
|
||||
rndc_port: <%= @rndc_port %>
|
||||
<% end -%>
|
||||
<% if !@rndc_config_file.nil? -%>
|
||||
rndc_config_file: <%= @rndc_config_file %>
|
||||
<% end -%>
|
||||
<% if !@rndc_key_file.nil? -%>
|
||||
rndc_key_file: <%= @rndc_key_file %>
|
||||
<% end -%>
|
||||
<% if @clean_zonefile -%>
|
||||
clean_zonefile: true
|
||||
<% end -%>
|
||||
|
||||
Reference in New Issue
Block a user