From 52dcad6bb1e74e08e09cb207b3665d90e1405e80 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Sun, 9 Feb 2025 08:44:03 +0900
Subject: [PATCH] designate: Omit rndc.conf

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
---
 manifests/bind.pp       | 13 -------------
 manifests/designate.pp  | 15 +++++----------
 templates/rndc.conf.erb |  6 ------
 3 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 templates/rndc.conf.erb

diff --git a/manifests/bind.pp b/manifests/bind.pp
index 2b3c59b6a..4866ec953 100644
--- a/manifests/bind.pp
+++ b/manifests/bind.pp
@@ -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]
-  }
 }
diff --git a/manifests/designate.pp b/manifests/designate.pp
index 8455e7ed6..147b0c5ae 100644
--- a/manifests/designate.pp
+++ b/manifests/designate.pp
@@ -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']
 }
diff --git a/templates/rndc.conf.erb b/templates/rndc.conf.erb
deleted file mode 100644
index 92c52c4a9..000000000
--- a/templates/rndc.conf.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-include "<%= @dnsdir %>/rndc.key";
-options {
-        default-key "rndc-key";
-        default-server <%= @bind_host %>;
-        default-port 953;
-};