Conditionalize rndc changes
The changes to allow configuration of more rndc options had a
cross-repo dependency on the tripleo-heat-templates changes that
made use of the new options. Unfortunately, the puppet changes
landed first and are now broken because necessary inputs are not
being provided. This change conditionalizes the new configurations
so that if the parameters aren't passed we won't attempt to do
invalid configuration.
Closes-Bug: #1788907
Change-Id: Ia82f1c6be0d5504498e77a90268cad8abecdeae2
(cherry picked from commit 3add939d4c
)
This commit is contained in:
parent
cda96f8bc7
commit
0134f91b94
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue