openstack/puppet-openstack-integration
Code Issues Proposed changes

designate: Omit rndc.conf

Browse Source 
Now the file is optional and is not needed unless additional config
options need to be injected.

Depends-on: https://review.opendev.org/941029
Change-Id: If7d10a397637737051f89a276de6d21c79c22a41
This commit is contained in:
Takashi Kajinami 2025-02-09 08:44:03 +09:00
parent 03380e72f2
commit 52dcad6bb1
3 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
manifests/bind.pp
View File

@ -41,17 +41,4 @@ class openstack_integration::bind {
}
},
}
$dnsdir = $::dns::params::dnsdir
# ::dns creates the rndc key but not a rndc.conf.
# Contribute this in upstream ::dns ?
file { 'rndc.conf':
ensure => present,
path => "${dnsdir}/rndc.conf",
owner => $::dns::params::user,
group => $::dns::params::group,
content => template("${module_name}/rndc.conf.erb"),
require => Package[$dns::params::dns_server_package]
}
}

15
manifests/designate.pp
View File

@ -121,16 +121,11 @@ class openstack_integration::designate (
}
class { 'designate::backend::bind9':
nameservers => [$::openstack_integration::config::host],
bind9_hosts => [$::openstack_integration::config::host],
dns_port => 5322,
mdns_hosts => [$::openstack_integration::config::host],
rndc_config_file => "${::dns::params::dnsdir}/rndc.conf",
rndc_key_file => $::dns::params::rndckeypath,
# Configure bind using openstack_integration::bind
configure_bind => false,
nameservers => [$::openstack_integration::config::host],
bind9_hosts => [$::openstack_integration::config::host],
dns_port => 5322,
mdns_hosts => [$::openstack_integration::config::host],
rndc_key_file => $::dns::rndckeypath,
}
File['rndc.conf'] -> Anchor['designate::service::begin']
Class['dns::service'] -> Anchor['designate::service::begin']
}

6
templates/rndc.conf.erb
View File

@ -1,6 +0,0 @@
include "<%= @dnsdir %>/rndc.key";
options {
default-key "rndc-key";
default-server <%= @bind_host %>;
default-port 953;
};