openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Conditionalize rndc changes"

This commit is contained in:
Zuul 2018-08-28 04:11:00 +00:00 committed by Gerrit Code Review
parent cb3abe9548 0ed2cf7aea
commit 27fbab5a97
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
manifests/profile/base/designate.pp
View File

@ -126,14 +126,18 @@ class tripleo::profile::base::designate (
'ssl' => $oslomsg_notify_use_ssl_real,
}),
}
class { '::designate::backend::bind9':
rndc_controls => {
$rndc_host => {
'port' => $rndc_port,
'keys' => $rndc_keys,
'allowed_addresses' => $rndc_allowed_addresses,
}
},
if ($rndc_host and $rndc_allowed_addresses) {
class { '::designate::backend::bind9':
rndc_controls => {
$rndc_host => {
'port' => $rndc_port,
'keys' => $rndc_keys,
'allowed_addresses' => $rndc_allowed_addresses,
}
},
}
} else {
include ::designate::backend::bind9
}
include ::designate::config
}

10
manifests/profile/base/designate/worker.pp
View File

@ -29,14 +29,16 @@
#
class tripleo::profile::base::designate::worker (
$step = Integer(hiera('step')),
$rndc_key = hiera('designate_rndc_key'),
$rndc_key = hiera('designate_rndc_key', false),
) {
include ::tripleo::profile::base::designate
if $step >= 4 {
file { 'designate rndc key':
path => '/etc/rndc.key',
content => template('tripleo/designate/rndc.key.erb')
if $rndc_key {
file { 'designate rndc key':
path => '/etc/rndc.key',
content => template('tripleo/designate/rndc.key.erb')
}
}
include ::designate::worker
}