External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-10 14:09:28 -02:30
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
AlanCoding
2025-09-04 23:06:53 -04:00
parent 51eb109dbe 7dc4f149a7
commit 8fb6a3a633
127 changed files with 14455 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx_collection/plugins/doc_fragments/auth_plugin.py
View File

@@ -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'