openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "designate: Omit rndc.conf"

Browse Source
This commit is contained in:
Zuul 2025-02-12 14:58:17 +00:00 committed by Gerrit Code Review
commit bbc786a6ef
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]
}
} }

7
manifests/designate.pp
View File

@ -125,12 +125,7 @@ class openstack_integration::designate (
bind9_hosts => [$::openstack_integration::config::host], bind9_hosts => [$::openstack_integration::config::host],
dns_port => 5322, dns_port => 5322,
mdns_hosts => [$::openstack_integration::config::host], mdns_hosts => [$::openstack_integration::config::host],
rndc_config_file => "${::dns::params::dnsdir}/rndc.conf", rndc_key_file => $::dns::rndckeypath,
rndc_key_file => $::dns::params::rndckeypath,
# Configure bind using openstack_integration::bind
configure_bind => false,
} }
File['rndc.conf'] -> Anchor['designate::service::begin']
Class['dns::service'] -> 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;
};