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

Fix #46546 eos napalm's grains issue #47513

Merged
merged 2 commits into from May 8, 2018
Merged

Fix #46546 eos napalm's grains issue #47513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
15e7e9f
fix #46546
May 7, 2018
f5d1261
Merge branch 'develop' into fix-eos-napalm
frankiexyz May 8, 2018
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
2 changes: 1 addition & 1 deletion salt/grains/napalm.py
View file
Open in desktop
Expand Up @@ -91,7 +91,7 @@ def _retrieve_device_cache(proxy=None):
DEVICE_CACHE = proxy['napalm.get_device']()
elif not proxy and salt.utils.napalm.is_minion(__opts__):
# if proxy var not passed and is running in a straight minion
DEVICE_CACHE = salt.utils.napalm.get_device_opts(__opts__)
DEVICE_CACHE = salt.utils.napalm.get_device(__opts__)
return DEVICE_CACHE


Expand Down