From 1ade9b3a7daa2b149e28ad08b4247423482539f1 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Wed, 5 May 2021 23:42:54 -0400 Subject: [PATCH] various references to tower --- awx_collection/plugins/modules/ad_hoc_command_cancel.py | 2 +- awx_collection/plugins/modules/credential.py | 2 +- awx_collection/plugins/modules/credential_type.py | 4 ++-- awx_collection/plugins/modules/notification_template.py | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/awx_collection/plugins/modules/ad_hoc_command_cancel.py b/awx_collection/plugins/modules/ad_hoc_command_cancel.py index 147ce838d1..98a0d414cb 100644 --- a/awx_collection/plugins/modules/ad_hoc_command_cancel.py +++ b/awx_collection/plugins/modules/ad_hoc_command_cancel.py @@ -98,7 +98,7 @@ def main(): cancel_page = module.get_endpoint(command['related']['cancel']) if 'json' not in cancel_page or 'can_cancel' not in cancel_page['json']: - module.fail_json(msg="Failed to cancel command, got unexpected response from tower", **{'response': cancel_page}) + module.fail_json(msg="Failed to cancel command, got unexpected response", **{'response': cancel_page}) if not cancel_page['json']['can_cancel']: if fail_if_not_running: diff --git a/awx_collection/plugins/modules/credential.py b/awx_collection/plugins/modules/credential.py index 6675f191cf..5146039928 100644 --- a/awx_collection/plugins/modules/credential.py +++ b/awx_collection/plugins/modules/credential.py @@ -395,7 +395,7 @@ def main(): # End backwards compatability state = module.params.get('state') - # Deprication warnings + # Deprecation warnings for legacy_input in OLD_INPUT_NAMES: if module.params.get(legacy_input) is not None: module.deprecate(msg='{0} parameter has been deprecated, please use inputs instead'.format(legacy_input), version="ansible.tower:4.0.0") diff --git a/awx_collection/plugins/modules/credential_type.py b/awx_collection/plugins/modules/credential_type.py index f9c4d4985a..2174f5432f 100644 --- a/awx_collection/plugins/modules/credential_type.py +++ b/awx_collection/plugins/modules/credential_type.py @@ -42,7 +42,7 @@ options: inputs: description: - >- - Enter inputs using either JSON or YAML syntax. Refer to the + Enter inputs using either JSON or YAML syntax. Refer to the Automation Platform Controler documentation for example syntax. type: dict injectors: @@ -66,7 +66,7 @@ EXAMPLES = ''' name: Nexus description: Credentials type for Nexus kind: cloud - inputs: "{{ lookup('file', 'tower_credential_inputs_nexus.json') }}" + inputs: "{{ lookup('file', 'credential_inputs_nexus.json') }}" injectors: {'extra_vars': {'nexus_credential': 'test' }} state: present validate_certs: false diff --git a/awx_collection/plugins/modules/notification_template.py b/awx_collection/plugins/modules/notification_template.py index c959b89cad..8ea0a8dd23 100644 --- a/awx_collection/plugins/modules/notification_template.py +++ b/awx_collection/plugins/modules/notification_template.py @@ -246,7 +246,7 @@ EXAMPLES = ''' notification_configuration: username: user password: s3cr3t - sender: tower@example.com + sender: controller@example.com recipients: - user1@example.com host: smtp.example.com @@ -286,7 +286,7 @@ EXAMPLES = ''' name: irc notification notification_type: irc notification_configuration: - nickname: tower + nickname: controller password: s3cr3t targets: - user1