From 67bd2badc92e4609019efcc7010172bf592a71e9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Tue, 22 Nov 2022 11:59:01 +0900
Subject: [PATCH] Fix missing [designate] options

This change ensures the [designate] options, which is used by
the designate external DNS driver, are rendered into neutron.conf
generated by oslo-config-generator.

Change-Id: I56a1079fbfc044532aee64f4fbdec50d9524a580
---
 etc/oslo-config-generator/neutron.conf |  1 +
 neutron/opts.py                        | 11 ++++++++++-
 setup.cfg                              |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/etc/oslo-config-generator/neutron.conf b/etc/oslo-config-generator/neutron.conf
index 599552e19ba..6426c24a5fe 100644
--- a/etc/oslo-config-generator/neutron.conf
+++ b/etc/oslo-config-generator/neutron.conf
@@ -10,6 +10,7 @@ namespace = neutron.extensions
 namespace = nova.auth
 namespace = ironic.auth
 namespace = placement.auth
+namespace = designate.auth
 namespace = oslo.log
 namespace = oslo.cache
 namespace = oslo.db
diff --git a/neutron/opts.py b/neutron/opts.py
index ab840cdf7cb..b6117c9cc78 100644
--- a/neutron/opts.py
+++ b/neutron/opts.py
@@ -51,6 +51,7 @@ import neutron.conf.plugins.ml2.drivers.openvswitch.mech_ovs_conf
 import neutron.conf.plugins.ml2.drivers.ovs_conf
 import neutron.conf.quota
 import neutron.conf.service
+import neutron.conf.services.extdns_designate_driver
 import neutron.conf.services.logging
 import neutron.conf.services.metering_agent
 import neutron.conf.wsgi
@@ -76,7 +77,8 @@ AUTH_GROUPS_OPTS = {
         }
     },
     'ironic': {},
-    'placement': {}
+    'placement': {},
+    'designate': {}
 }
 
 CONF = cfg.CONF
@@ -116,6 +118,10 @@ def list_placement_auth_opts():
     return list_auth_opts('placement')
 
 
+def list_designate_auth_opts():
+    return list_auth_opts('designate')
+
+
 def list_agent_opts():
     return [
         ('agent',
@@ -191,6 +197,9 @@ def list_opts():
          itertools.chain(
              neutron.conf.common.placement_opts)
          ),
+        ('designate',
+         neutron.conf.services.extdns_designate_driver.designate_opts
+         ),
         ('quotas', neutron.conf.quota.core_quota_opts)
     ]
 
diff --git a/setup.cfg b/setup.cfg
index d72492d1a2e..13ee300d075 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -151,6 +151,7 @@ neutron.agent.linux.pd_drivers =
 neutron.services.external_dns_drivers =
     designate = neutron.services.externaldns.drivers.designate.driver:Designate
 oslo.config.opts =
+    designate.auth = neutron.opts:list_designate_auth_opts
     ironic.auth = neutron.opts:list_ironic_auth_opts
     neutron = neutron.opts:list_opts
     neutron.agent = neutron.opts:list_agent_opts