Merge "Fix missing session options in [service_credentials]"
This commit is contained in:
@@ -113,6 +113,7 @@ def list_keystoneauth_opts():
|
|||||||
# for the password plugin that handles keystone v2 and v3 API
|
# for the password plugin that handles keystone v2 and v3 API
|
||||||
# with discovery. But other options are possible.
|
# with discovery. But other options are possible.
|
||||||
return [('service_credentials', itertools.chain(
|
return [('service_credentials', itertools.chain(
|
||||||
|
loading.get_session_conf_options(),
|
||||||
loading.get_auth_common_conf_options(),
|
loading.get_auth_common_conf_options(),
|
||||||
loading.get_auth_plugin_conf_options('password'),
|
loading.get_auth_plugin_conf_options('password'),
|
||||||
ceilometer.keystone_client.CLI_OPTS
|
ceilometer.keystone_client.CLI_OPTS
|
||||||
|
Reference in New Issue
Block a user