summaryrefslogtreecommitdiff
path: root/lib/ansible/plugins/action
diff options
context:
space:
mode:
authorPaul Belanger <pabelanger@redhat.com>2020-01-09 21:51:59 -0500
committerGitHub <noreply@github.com>2020-01-09 21:51:59 -0500
commit7a7f70612a94d381c8c081965abc1f79023dcb0d (patch)
tree89dc5cedb278b41bc9db641efb9fc1f7a63c45f2 /lib/ansible/plugins/action
parent7ed00a156030917adac044bc626d44e629ca23b4 (diff)
downloadansible-7a7f70612a94d381c8c081965abc1f79023dcb0d.tar.gz
Revert "Fix net_put module text file issue (#66065)" (#66328)
This PR didn't properly run testing for network jobs. As a result it has broken jobs for ios and junos. This reverts commit fa66813696b372bc4b8e0d836968e226a56928c7.
Diffstat (limited to 'lib/ansible/plugins/action')
-rw-r--r--lib/ansible/plugins/action/net_get.py4
-rw-r--r--lib/ansible/plugins/action/net_put.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/ansible/plugins/action/net_get.py b/lib/ansible/plugins/action/net_get.py
index d9bc6e5398..4f96f9d961 100644
--- a/lib/ansible/plugins/action/net_get.py
+++ b/lib/ansible/plugins/action/net_get.py
@@ -25,14 +25,14 @@ import hashlib
from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.connection import Connection, ConnectionError
-from ansible.plugins.action.network import ActionModule as ActionNetworkModule
+from ansible.plugins.action import ActionBase
from ansible.module_utils.six.moves.urllib.parse import urlsplit
from ansible.utils.display import Display
display = Display()
-class ActionModule(ActionNetworkModule):
+class ActionModule(ActionBase):
def run(self, tmp=None, task_vars=None):
socket_path = None
diff --git a/lib/ansible/plugins/action/net_put.py b/lib/ansible/plugins/action/net_put.py
index e8aef23d42..a1b83fc6c4 100644
--- a/lib/ansible/plugins/action/net_put.py
+++ b/lib/ansible/plugins/action/net_put.py
@@ -24,14 +24,14 @@ import hashlib
from ansible.errors import AnsibleError
from ansible.module_utils._text import to_text, to_bytes
from ansible.module_utils.connection import Connection, ConnectionError
-from ansible.plugins.action.network import ActionModule as ActionNetworkModule
+from ansible.plugins.action import ActionBase
from ansible.module_utils.six.moves.urllib.parse import urlsplit
from ansible.utils.display import Display
display = Display()
-class ActionModule(ActionNetworkModule):
+class ActionModule(ActionBase):
def run(self, tmp=None, task_vars=None):
socket_path = None
@@ -69,7 +69,7 @@ class ActionModule(ActionNetworkModule):
if mode == 'text':
try:
- self._handle_src_option(convert_data=False)
+ self._handle_template(convert_data=False)
except ValueError as exc:
return dict(failed=True, msg=to_text(exc))