Merge "Fix missing [designate] options"

This commit is contained in:
Zuul 2022-11-25 09:07:33 +00:00 committed by Gerrit Code Review
commit ad742401b7
3 changed files with 12 additions and 1 deletions

View File

@ -10,6 +10,7 @@ namespace = neutron.extensions
namespace = nova.auth namespace = nova.auth
namespace = ironic.auth namespace = ironic.auth
namespace = placement.auth namespace = placement.auth
namespace = designate.auth
namespace = oslo.log namespace = oslo.log
namespace = oslo.cache namespace = oslo.cache
namespace = oslo.db namespace = oslo.db

View File

@ -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.plugins.ml2.drivers.ovs_conf
import neutron.conf.quota import neutron.conf.quota
import neutron.conf.service import neutron.conf.service
import neutron.conf.services.extdns_designate_driver
import neutron.conf.services.logging import neutron.conf.services.logging
import neutron.conf.services.metering_agent import neutron.conf.services.metering_agent
import neutron.conf.wsgi import neutron.conf.wsgi
@ -76,7 +77,8 @@ AUTH_GROUPS_OPTS = {
} }
}, },
'ironic': {}, 'ironic': {},
'placement': {} 'placement': {},
'designate': {}
} }
CONF = cfg.CONF CONF = cfg.CONF
@ -116,6 +118,10 @@ def list_placement_auth_opts():
return list_auth_opts('placement') return list_auth_opts('placement')
def list_designate_auth_opts():
return list_auth_opts('designate')
def list_agent_opts(): def list_agent_opts():
return [ return [
('agent', ('agent',
@ -191,6 +197,9 @@ def list_opts():
itertools.chain( itertools.chain(
neutron.conf.common.placement_opts) neutron.conf.common.placement_opts)
), ),
('designate',
neutron.conf.services.extdns_designate_driver.designate_opts
),
('quotas', neutron.conf.quota.core_quota_opts) ('quotas', neutron.conf.quota.core_quota_opts)
] ]

View File

@ -151,6 +151,7 @@ neutron.agent.linux.pd_drivers =
neutron.services.external_dns_drivers = neutron.services.external_dns_drivers =
designate = neutron.services.externaldns.drivers.designate.driver:Designate designate = neutron.services.externaldns.drivers.designate.driver:Designate
oslo.config.opts = oslo.config.opts =
designate.auth = neutron.opts:list_designate_auth_opts
ironic.auth = neutron.opts:list_ironic_auth_opts ironic.auth = neutron.opts:list_ironic_auth_opts
neutron = neutron.opts:list_opts neutron = neutron.opts:list_opts
neutron.agent = neutron.opts:list_agent_opts neutron.agent = neutron.opts:list_agent_opts