openstack/placement
Code Issues Proposed changes

Merge "Register keystone opts for placement sample config"

Browse Source
This commit is contained in:
Jenkins 2016-09-01 03:15:11 +00:00 committed by Gerrit Code Review
commit adf7c107d4
1 changed files with 9 additions and 3 deletions

12
nova/conf/placement.py

@ -34,11 +34,17 @@ Possible values:
def register_opts(conf): def register_opts(conf):
conf.register_group(placement_group) conf.register_group(placement_group)
conf.register_opts(placement_opts, group=placement_group) conf.register_opts(placement_opts, group=placement_group)
ks_loading.register_auth_conf_options(conf, ks_loading.register_session_conf_options(conf, placement_group.name)
placement_group.name) ks_loading.register_auth_conf_options(conf, placement_group.name)
def list_opts(): def list_opts():
return { return {
placement_group.name: placement_opts placement_group.name: (
placement_opts +
ks_loading.get_session_conf_options() +
ks_loading.get_auth_common_conf_options() +
ks_loading.get_auth_plugin_conf_options('password') +
ks_loading.get_auth_plugin_conf_options('v2password') +
ks_loading.get_auth_plugin_conf_options('v3password'))
} }