summaryrefslogtreecommitdiffstats
path: root/awx_modules/plugins/modules/tower_send.py
diff options
context:
space:
mode:
authorAlanCoding <arominge@redhat.com>2019-08-30 23:11:01 +0200
committerAlanCoding <arominge@redhat.com>2019-09-27 20:29:03 +0200
commit2f0f692f4a2758a2d3dc8c2b6c21c5affd39906a (patch)
treeb5df048a5ffb4c026146aa272f2fb4fd2ff19afc /awx_modules/plugins/modules/tower_send.py
parentMove commit for migration of Ansible core tower modules (diff)
downloadawx-2f0f692f4a2758a2d3dc8c2b6c21c5affd39906a.tar.xz
awx-2f0f692f4a2758a2d3dc8c2b6c21c5affd39906a.zip
Integrate Ansible core tower modules content into AWX
This commit includes all the changes involved in converting the old Ansible Tower modules from commits in Ansible core into the AWX collection that replaces it. Also includes work needed to integrate it into the AWX processes like tests, docs, and the Makefile. Apply changes from content_collector tool Add integrated module tests operate via run_module fixture add makefile target for them Add flake8 target and fix flake8 errors Update README Make consolidated target for testing modules
Diffstat (limited to 'awx_modules/plugins/modules/tower_send.py')
-rw-r--r--awx_modules/plugins/modules/tower_send.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/awx_modules/plugins/modules/tower_send.py b/awx_modules/plugins/modules/tower_send.py
index d8011806fe..3cd46ff613 100644
--- a/awx_modules/plugins/modules/tower_send.py
+++ b/awx_modules/plugins/modules/tower_send.py
@@ -76,7 +76,7 @@ import os
import sys
from ansible.module_utils.six.moves import StringIO
-from ansible.module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
+from ..module_utils.ansible_tower import TowerModule, tower_auth_config, HAS_TOWER_CLI
from tempfile import mkstemp
@@ -138,7 +138,7 @@ def main():
sys.stdout = captured_stdout = StringIO()
try:
sender.send(files, prevent, password_management)
- except TypeError as e:
+ except TypeError:
# Newer versions of TowerCLI require 4 parameters
sender.send(files, prevent, [], password_management)