From ec8b386ac554f00c7b7a8979bb015ecbca404ac7 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Wed, 31 Aug 2016 09:57:57 -0400 Subject: [PATCH] Register keystone opts for placement sample config This adds the keystone options that you would need into the sample config generation for the placement section. It also cleans up neutron config reference to be more like the ironic, which is a ton easier to understand. Change-Id: Id31b47b4fe20cd10bef20f1efe30b04d744a0f99 --- nova/conf/placement.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/nova/conf/placement.py b/nova/conf/placement.py index 1bbcf0276..aa7fa0259 100644 --- a/nova/conf/placement.py +++ b/nova/conf/placement.py @@ -34,11 +34,17 @@ Possible values: def register_opts(conf): conf.register_group(placement_group) conf.register_opts(placement_opts, group=placement_group) - ks_loading.register_auth_conf_options(conf, - placement_group.name) + ks_loading.register_session_conf_options(conf, placement_group.name) + ks_loading.register_auth_conf_options(conf, placement_group.name) def list_opts(): 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')) }