summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2017-09-14 15:40:50 +0100
committerToshio Kuratomi <a.badger@gmail.com>2017-09-14 09:11:20 -0700
commit7794b1e465062f608881af4f11aef50766559c6d (patch)
tree23ec089ab7a8b81f6098bb90d111a2e948b2e713
parentf25f03b53971522d11bf941bf096bc47e6490c6b (diff)
downloadansible-7794b1e465062f608881af4f11aef50766559c6d.tar.gz
Fix Dell OS network module timeout (#30355)
The dellos action plugins should add the remote address of the switch provider to the play context. This was fixed in issue #23589 in an almost identical manner for the eos, ios, iosxr, and vyos action plugins. Fixes: #30350 (cherry picked from commit ac69fcccdc77062ad7175e92606c77b769edad97)
-rw-r--r--lib/ansible/plugins/action/dellos10.py1
-rw-r--r--lib/ansible/plugins/action/dellos6.py1
-rw-r--r--lib/ansible/plugins/action/dellos9.py1
3 files changed, 3 insertions, 0 deletions
diff --git a/lib/ansible/plugins/action/dellos10.py b/lib/ansible/plugins/action/dellos10.py
index a468e26c7f..9368aabb3e 100644
--- a/lib/ansible/plugins/action/dellos10.py
+++ b/lib/ansible/plugins/action/dellos10.py
@@ -53,6 +53,7 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli'
pc.network_os = 'dellos10'
+ pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password
diff --git a/lib/ansible/plugins/action/dellos6.py b/lib/ansible/plugins/action/dellos6.py
index 1fdf63d3a7..8668e1d2b4 100644
--- a/lib/ansible/plugins/action/dellos6.py
+++ b/lib/ansible/plugins/action/dellos6.py
@@ -49,6 +49,7 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli'
pc.network_os = 'dellos6'
+ pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password
diff --git a/lib/ansible/plugins/action/dellos9.py b/lib/ansible/plugins/action/dellos9.py
index 6fc07e6d27..edf5ff4486 100644
--- a/lib/ansible/plugins/action/dellos9.py
+++ b/lib/ansible/plugins/action/dellos9.py
@@ -53,6 +53,7 @@ class ActionModule(_ActionModule):
pc = copy.deepcopy(self._play_context)
pc.connection = 'network_cli'
pc.network_os = 'dellos9'
+ pc.remote_addr = provider['host'] or self._play_context.remote_addr
pc.port = int(provider['port'] or self._play_context.port or 22)
pc.remote_user = provider['username'] or self._play_context.connection_user
pc.password = provider['password'] or self._play_context.password