summaryrefslogtreecommitdiff
path: root/os_client_config/__init__.py
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2017-02-27 09:34:24 -0600
committerMonty Taylor <mordred@inaugust.com>2017-02-27 09:36:57 -0600
commit81e04fcec6cb333a7d44124c045358c4904cf765 (patch)
treedb36b0c6bf600d966886e0ee6b7386e3d5887ba1 /os_client_config/__init__.py
parentcbb38f38bceee7977952651bd0466902c087de8d (diff)
downloados-client-config-81e04fcec6cb333a7d44124c045358c4904cf765.tar.gz
Add ability to skip yaml loading
Added a flag, 'load_yaml_config' that defaults to True. If set to false, no clouds.yaml files will be loaded. This is beneficial if os-client-config wants to be used inside of a service where end-user clouds.yaml files would make things more confusing. Change-Id: Idbc82bb931e9edf1bbcc575237c0e202e219c218
Diffstat (limited to 'os_client_config/__init__.py')
-rw-r--r--os_client_config/__init__.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/os_client_config/__init__.py b/os_client_config/__init__.py
index e8d7fc0..a36a130 100644
--- a/os_client_config/__init__.py
+++ b/os_client_config/__init__.py
@@ -24,7 +24,8 @@ __version__ = pbr.version.VersionInfo('os_client_config').version_string()
def get_config(service_key=None, options=None, **kwargs):
- config = OpenStackConfig()
+ load_yaml_config = kwargs.pop('load_yaml_config', True)
+ config = OpenStackConfig(load_yaml_config=load_yaml_config)
if options:
config.register_argparse_arguments(options, sys.argv, service_key)
parsed_options = options.parse_known_args(sys.argv)