From ca782a495d22ee3f83b341581283f216b5ea68a0 Mon Sep 17 00:00:00 2001 From: Jordan Borean Date: Fri, 8 Feb 2019 10:07:01 +1000 Subject: [PATCH] Final round of moving modules to new import error msg (#51852) * Final round of moving modules to new import error msg * readd URL to jenkins install guide * fix unit tests --- lib/ansible/module_utils/ansible_tower.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/ansible/module_utils/ansible_tower.py b/lib/ansible/module_utils/ansible_tower.py index 0e3d1301c0..9caf3e3e65 100644 --- a/lib/ansible/module_utils/ansible_tower.py +++ b/lib/ansible/module_utils/ansible_tower.py @@ -27,7 +27,9 @@ # USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import os +import traceback +TOWER_CLI_IMP_ERR = None try: import tower_cli.utils.exceptions as exc from tower_cli.utils import parser @@ -35,9 +37,10 @@ try: HAS_TOWER_CLI = True except ImportError: + TOWER_CLI_IMP_ERR = traceback.format_exc() HAS_TOWER_CLI = False -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib def tower_auth_config(module): @@ -105,4 +108,5 @@ class TowerModule(AnsibleModule): super(TowerModule, self).__init__(argument_spec=args, **kwargs) if not HAS_TOWER_CLI: - self.fail_json(msg='ansible-tower-cli required for this module') + self.fail_json(msg=missing_required_lib('ansible-tower-cli'), + exception=TOWER_CLI_IMP_ERR)