valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26746 from rallytime/nova_configs_fix

Browse Source 
Make sure nova configs are set before checking for dependencies
This commit is contained in:
Joseph Hall 2015-08-28 15:34:58 -06:00
commit 3f7cc8318e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/cloud/clouds/nova.py
View File

@ -155,6 +155,9 @@ def __virtual__():
'''
request_log.setLevel(getattr(logging, __opts__.get('requests_log_level', 'warning').upper()))
if get_configured_provider() is False:
return False
if get_dependencies() is False:
return False
@ -167,7 +170,8 @@ def get_configured_provider():
'''
return config.is_provider_configured(
__opts__,
__active_provider_name__ or __virtualname__
__active_provider_name__ or __virtualname__,
('user', 'tenant', 'identity_url', 'compute_region',)
)