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 network plugin config option load from collection (#64046) #64195

Merged
merged 1 commit into from Nov 12, 2019
Merged

Fix network plugin config option load from collection (#64046) #64195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions changelogs/fragments/network_plugin_collection_fix.yaml
View file
Open in desktop
@@ -0,0 +1,2 @@
bugfixes:
- Can't use plugin options vars in playbook when using collections (https://github.com/ansible/ansible/issues/63975)
5 changes: 3 additions & 2 deletions lib/ansible/plugins/connection/httpapi.py
View file
Open in desktop
Expand Up @@ -201,8 +201,9 @@ def __init__(self, play_context, new_stdin, *args, **kwargs):

self.httpapi = httpapi_loader.get(self._network_os, self)
if self.httpapi:
self._sub_plugin = {'type': 'httpapi', 'name': self._network_os, 'obj': self.httpapi}
self.queue_message('vvvv', 'loaded API plugin for network_os %s' % self._network_os)
self._sub_plugin = {'type': 'httpapi', 'name': self.httpapi._load_name, 'obj': self.httpapi}
self.queue_message('vvvv', 'loaded API plugin %s from path %s for network_os %s' %
(self.httpapi._load_name, self.httpapi._original_path, self._network_os))
else:
raise AnsibleConnectionFailure('unable to load API plugin for network_os %s' % self._network_os)

Expand Down
5 changes: 3 additions & 2 deletions lib/ansible/plugins/connection/netconf.py
View file
Open in desktop
Expand Up @@ -227,8 +227,9 @@ def __init__(self, play_context, new_stdin, *args, **kwargs):

netconf = netconf_loader.get(self._network_os, self)
if netconf:
self._sub_plugin = {'type': 'netconf', 'name': self._network_os, 'obj': netconf}
self.queue_message('log', 'loaded netconf plugin for network_os %s' % self._network_os)
self._sub_plugin = {'type': 'netconf', 'name': netconf._load_name, 'obj': netconf}
self.queue_message('vvvv', 'loaded netconf plugin %s from path %s for network_os %s' %
(netconf._load_name, netconf._original_path, self._network_os))
else:
netconf = netconf_loader.get("default", self)
self._sub_plugin = {'type': 'netconf', 'name': 'default', 'obj': netconf}
Expand Down
5 changes: 3 additions & 2 deletions lib/ansible/plugins/connection/network_cli.py
View file
Open in desktop
Expand Up @@ -330,8 +330,9 @@ def __init__(self, play_context, new_stdin, *args, **kwargs):

self.cliconf = cliconf_loader.get(self._network_os, self)
if self.cliconf:
self.queue_message('vvvv', 'loaded cliconf plugin for network_os %s' % self._network_os)
self._sub_plugin = {'type': 'cliconf', 'name': self._network_os, 'obj': self.cliconf}
self._sub_plugin = {'type': 'cliconf', 'name': self.cliconf._load_name, 'obj': self.cliconf}
self.queue_message('vvvv', 'loaded cliconf plugin %s from path %s for network_os %s' %
(self.cliconf._load_name, self.cliconf._original_path, self._network_os))
else:
self.queue_message('vvvv', 'unable to load cliconf for network_os %s' % self._network_os)
else:
Expand Down