Merge remote-tracking branch 'tower/test_stable-2.6' into merge_26_2

awx_collection/plugins/doc_fragments/auth.py

@@ -40,6 +40,7 @@ options:
     - A dictionary structure as returned by the token module.
     - If value not set, will try environment variable C(CONTROLLER_OAUTH_TOKEN) and then config files
     type: raw
+    aliases: [ controller_oauthtoken ]
     version_added: "3.7.0"
   validate_certs:
     description:
@@ -60,7 +61,7 @@ options:
     - Path to the controller config file.
     - If provided, the other locations for config files will not be considered.
     type: path
-    aliases: [tower_config_file]
+    aliases: [ tower_config_file ]
 
 notes:
 - If no I(config_file) is provided we will attempt to use the tower-cli library

awx_collection/plugins/doc_fragments/auth_plugin.py

@@ -40,11 +40,20 @@ options:
         version: '4.0.0'
         why: Collection name change
         alternatives: 'TOWER_PASSWORD, AAP_PASSWORD'
+<<<<<<< HEAD
   aap_token:
+=======
+  oauth_token:
+>>>>>>> tower/test_stable-2.6
     description:
     - The OAuth token to use.
     env:
     - name: AAP_TOKEN
+<<<<<<< HEAD
+=======
+    - name: CONTROLLER_OAUTH_TOKEN
+    - name: TOWER_OAUTH_TOKEN
+>>>>>>> tower/test_stable-2.6
       deprecated:
         collection_name: 'awx.awx'
         version: '4.0.0'