wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes import statement in nxos_facts module (#21834)

Browse source 
trying to import from the wrong shared lib, this patch changes
network_common to connection.  Also fixes a bug found in the nxos
action plugin to detect transport

fixes #21829
This commit is contained in:
Peter Sprygada 2017-02-23 08:00:34 -05:00 committed by John R Barker
parent 551a765ea5
commit ab0f992b3a
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/modules/network/nxos/nxos_facts.py
View file

@ -181,7 +181,7 @@ import re
from ansible.module_utils.nxos import run_commands
from ansible.module_utils.nxos import nxos_argument_spec, check_args
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.network_common import exec_command
from ansible.module_utils.connection import exec_command
from ansible.module_utils.six import iteritems

4
lib/ansible/plugins/action/nxos.py
View file

@ -99,7 +99,9 @@ class ActionModule(_ActionModule):
self._task.args['provider'] = provider_arg
# make sure a transport value is set in args
if self._task.args.get('transport') is None and self._task.args.get('provider').get('transport') is None:
transport = self._task.args.get('transport')
provider_transport = (self._task.args.get('provider') or {}).get('transport')
if all((transport is None, provider_transport is None)):
self._task.args['transport'] = 'cli'
return super(ActionModule, self).run(tmp, task_vars)