Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Don't call potentially missing shade library (#53734) #54143

Merged
merged 2 commits into from Aug 9, 2019
Merged

Don't call potentially missing shade library (#53734) #54143

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
71f5f38
Don't call potentially missing shade library (#53734)
Akm0d Jul 6, 2019
3f58885
Merge branch '2019.2.1' into openstack_fix
Akm0d Aug 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions salt/cloud/clouds/openstack.py
View file
Open in desktop
Expand Up @@ -273,6 +273,12 @@ def get_dependencies():
'''
Warn if dependencies aren't met.
'''
if not HAS_SHADE:
log.warning('"shade" not found')
return False
elif hasattr(HAS_SHADE, '__len__') and not HAS_SHADE[0]:
log.warning(HAS_SHADE[1])
return False
deps = {
'shade': shade[0],
'os_client_config': shade[0],
Expand Down