auth_plugin env alternative

4 files changed, 32 insertions, 16 deletions

diff --git a/awx_collection/plugins/doc_fragments/auth_plugin.py b/awx_collection/plugins/doc_fragments/auth_plugin.py
index 0243d2069e..644bce9c9a 100644
--- a/awx_collection/plugins/doc_fragments/auth_plugin.py
+++ b/awx_collection/plugins/doc_fragments/auth_plugin.py
@@ -17,19 +17,31 @@ options:
         description: The network address of your Automation Platform Controller host.
         env:
             - name: CONTROLLER_HOST
+            - name: TOWER_HOST
+              deprecated:
+                alternatives: 'CONTROLLER_HOST'
     username:
         description: The user that you plan to use to access inventories on the controller.
         env:
             - name: CONTROLLER_USERNAME
+            - name: TOWER_USERNAME
+              deprecated:
+                alternatives: 'CONTROLLER_USERNAME'
     password:
         description: The password for your controller user.
         env:
             - name: CONTROLLER_PASSWORD
+            - name: TOWER_PASSWORD
+              deprecated:
+                alternatives: 'CONTROLLER_PASSWORD'
     oauth_token:
         description:
             - The OAuth token to use.
         env:
             - name: CONTROLLER_OAUTH_TOKEN
+            - name: TOWER_OAUTH_TOKEN
+              deprecated:
+                alternatives: 'CONTROLLER_OAUTH_TOKEN'
     verify_ssl:
         description:
             - Specify whether Ansible should verify the SSL certificate of the controller host.
@@ -37,6 +49,9 @@ options:
         type: bool
         env:
             - name: CONTROLLER_VERIFY_SSL
+            - name: TOWER_VERIFY_SSL
+              deprecated:
+                alternatives: 'CONTROLLER_VERIFY_SSL'
         aliases: [ validate_certs ]
 
 notes:
diff --git a/awx_collection/plugins/lookup/controller_api.py b/awx_collection/plugins/lookup/controller_api.py
index d959d17b8a..d1de34271d 100644
--- a/awx_collection/plugins/lookup/controller_api.py
+++ b/awx_collection/plugins/lookup/controller_api.py
@@ -75,7 +75,8 @@ EXAMPLES = """
 
 - name: Load the UI settings specifying the connection info
   set_fact:
-    controller_settings: "{{ lookup('awx.awx.controller_api', 'settings/ui' host='controller.example.com', username='admin', password=my_pass_var, verify_ssl=False) }}"
+    controller_settings: "{{ lookup('awx.awx.controller_api', 'settings/ui' host='controller.example.com',
+                             username='admin', password=my_pass_var, verify_ssl=False) }}"
 
 - name: Report the usernames of all users with admin privs
   debug:
diff --git a/awx_collection/tests/sanity/ignore-2.11.txt b/awx_collection/tests/sanity/ignore-2.11.txt
index 88c3a3f195..6964b9b84c 100644
--- a/awx_collection/tests/sanity/ignore-2.11.txt
+++ b/awx_collection/tests/sanity/ignore-2.11.txt
@@ -1 +1 @@
-plugins/module_utils/tower_api.py pep8:E203
+plugins/module_utils/controller_api.py pep8:E203
diff --git a/awx_collection/tests/sanity/ignore-2.9.txt b/awx_collection/tests/sanity/ignore-2.9.txt
index 8394f83e57..5eb23a7b61 100644
--- a/awx_collection/tests/sanity/ignore-2.9.txt
+++ b/awx_collection/tests/sanity/ignore-2.9.txt
@@ -1,16 +1,16 @@
-plugins/modules/tower_receive.py validate-modules:deprecation-mismatch
-plugins/modules/tower_receive.py validate-modules:invalid-documentation
-plugins/modules/tower_send.py validate-modules:deprecation-mismatch
-plugins/modules/tower_send.py validate-modules:invalid-documentation
-plugins/modules/tower_workflow_template.py validate-modules:deprecation-mismatch
-plugins/modules/tower_workflow_template.py validate-modules:invalid-documentation
-plugins/inventory/tower.py pylint:raise-missing-from
-plugins/inventory/tower.py pylint:super-with-arguments
-plugins/lookup/tower_schedule_rrule.py pylint:raise-missing-from
-plugins/module_utils/tower_api.py pylint:super-with-arguments
-plugins/module_utils/tower_awxkit.py pylint:super-with-arguments
+plugins/modules/receive.py validate-modules:deprecation-mismatch
+plugins/modules/receive.py validate-modules:invalid-documentation
+plugins/modules/send.py validate-modules:deprecation-mismatch
+plugins/modules/send.py validate-modules:invalid-documentation
+plugins/modules/workflow_template.py validate-modules:deprecation-mismatch
+plugins/modules/workflow_template.py validate-modules:invalid-documentation
+plugins/inventory/controller.py pylint:raise-missing-from
+plugins/inventory/controller.py pylint:super-with-arguments
+plugins/lookup/schedule_rrule.py pylint:raise-missing-from
+plugins/module_utils/controller_api.py pylint:super-with-arguments
+plugins/module_utils/awxkit.py pylint:super-with-arguments
 plugins/module_utils/tower_legacy.py pylint:super-with-arguments
-plugins/module_utils/tower_module.py pylint:super-with-arguments
-plugins/module_utils/tower_module.py pylint:raise-missing-from
+plugins/module_utils/controller_module.py pylint:super-with-arguments
+plugins/module_utils/controller_module.py pylint:raise-missing-from
 test/awx/conftest.py pylint:raise-missing-from
-plugins/module_utils/tower_api.py pep8:E203
+plugins/module_utils/controller_api.py pep8:E203