openstack/mistral
Code Issues Proposed changes

Merge "Get rid of deprecated keystone config override"

Browse Source
This commit is contained in:
Zuul 2025-02-21 12:08:42 +00:00 committed by Gerrit Code Review
commit 2e3d2d7e58
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mistral/cmd/launch.py
View File

@ -191,23 +191,6 @@ def get_properly_ordered_parameters():
return args
def override_keystone_options():
# TODO(wxy): This function is used for keeping backward compatibility.
# Remove it in Stein.
auth_opts = CONF['keystone_authtoken']
for opt, value in auth_opts.items():
if opt in CONF['keystone']:
default_value = auth_opts._group._opts[opt]['opt'].default
if default_value != value != CONF['keystone'][opt]:
LOG.warning("The config option '%s' in section "
"[keystone_authtoken] has the same copy in "
"[keystone]. Please add the same option to the "
"[keystone] section to keep using it.", opt)
CONF.set_override(opt, value, group='keystone')
def main():
try:
CONF.register_cli_opts(config.CLI_OPTS)
@ -218,8 +201,6 @@ def main():
logging.setup(CONF, 'Mistral')
override_keystone_options()
# Please refer to the oslo.messaging documentation for transport
# configuration. The default transport for oslo.messaging is
# rabbitMQ. The available transport drivers are listed in the