Merge "Remove redundant override of dns::controls"
This commit is contained in:
commit
2b9ca1addc
|
@ -6,21 +6,11 @@ class openstack_integration::bind {
|
|||
include openstack_integration::config
|
||||
include openstack_integration::params
|
||||
|
||||
# Need some particular options that aren't default in ::dns when using
|
||||
# designate with bind9 backend. Set them up.
|
||||
$controls = {
|
||||
'127.0.0.1' => {
|
||||
'port' => 953,
|
||||
'allowed_addresses' => [ '127.0.0.1' ],
|
||||
'keys' => [ 'rndc-key' ]
|
||||
},
|
||||
}
|
||||
# NOTE (dmsimard): listen_on_v6 is false and overridden due to extended port
|
||||
# configuration in additional_options
|
||||
class { 'dns':
|
||||
recursion => 'no',
|
||||
allow_recursion => [],
|
||||
controls => $controls,
|
||||
listen_on_v6 => false,
|
||||
additional_options => {
|
||||
'listen-on' => 'port 5322 { any; }',
|
||||
|
|
Loading…
Reference in New Issue