saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Return a configured provider, not a bool

Browse source
This commit is contained in:
Tyler Johnson 2019-09-26 16:35:06 -06:00
parent c585550955
commit 1c2821be26
No known key found for this signature in database
GPG key ID: 691E31397E27D004
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
salt/cloud/clouds/openstack.py
View file

@ -260,10 +260,14 @@ def get_configured_provider():
'''
Return the first configured instance.
'''
return config.is_provider_configured(
provider = config.is_provider_configured(
__opts__, __active_provider_name__ or __virtualname__,
('auth', 'region_name'), log_message=False,
) or config.is_provider_configured(
('auth', 'region_name')
)
if provider:
return provider
return config.is_provider_configured(
__opts__, __active_provider_name__ or __virtualname__,
('cloud', 'region_name')
)