Merge "Fix missing [designate] options"

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

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)
     ]
 

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