mirror of
https://github.com/ansible/awx.git
synced 2026-07-05 05:18:02 -02:30
[AAP-47877] Backport collection updates (#6992)
* Update collection args (#16025) * update collection arguments * Add integration testing for new param * fix: sanity check failures --------- Co-authored-by: Sean Sullivan <ssulliva@redhat.com> Co-authored-by: Alan Rominger <arominge@redhat.com> * update formatting for sanity testing * fixing indentation for sanity suite * adjust tests to use new token name * update tests to use aap_token instead of controller_oauthtoken * add back aliases for backward compat * we have integration tests that still leverage the old token name * while we can rename these, this tells me that customers might still have them in the wild and breaking them in a z stream is no bueno * revert alias changes --------- Co-authored-by: Peter Braun <pbraun@redhat.com> Co-authored-by: Sean Sullivan <ssulliva@redhat.com> Co-authored-by: Alan Rominger <arominge@redhat.com>
This commit is contained in:
@@ -19,20 +19,20 @@ options:
|
||||
- If value not set, will try environment variable C(CONTROLLER_HOST) and then config files
|
||||
- If value not specified by any means, the value of C(127.0.0.1) will be used
|
||||
type: str
|
||||
aliases: [ tower_host ]
|
||||
aliases: [ tower_host, aap_hostname ]
|
||||
controller_username:
|
||||
description:
|
||||
- Username for your controller instance.
|
||||
- If value not set, will try environment variable C(CONTROLLER_USERNAME) and then config files
|
||||
type: str
|
||||
aliases: [ tower_username ]
|
||||
aliases: [ tower_username, aap_username ]
|
||||
controller_password:
|
||||
description:
|
||||
- Password for your controller instance.
|
||||
- If value not set, will try environment variable C(CONTROLLER_PASSWORD) and then config files
|
||||
type: str
|
||||
aliases: [ tower_password ]
|
||||
controller_oauthtoken:
|
||||
aliases: [ tower_password , aap_password ]
|
||||
aap_token:
|
||||
description:
|
||||
- The OAuth token to use.
|
||||
- This value can be in one of two formats.
|
||||
@@ -41,7 +41,6 @@ options:
|
||||
- If value not set, will try environment variable C(CONTROLLER_OAUTH_TOKEN) and then config files
|
||||
type: raw
|
||||
version_added: "3.7.0"
|
||||
aliases: [ tower_oauthtoken ]
|
||||
validate_certs:
|
||||
description:
|
||||
- Whether to allow insecure connections to AWX.
|
||||
@@ -49,18 +48,19 @@ options:
|
||||
- This should only be used on personally controlled sites using self-signed certificates.
|
||||
- If value not set, will try environment variable C(CONTROLLER_VERIFY_SSL) and then config files
|
||||
type: bool
|
||||
aliases: [ tower_verify_ssl ]
|
||||
aliases: [ tower_verify_ssl, aap_validate_certs ]
|
||||
request_timeout:
|
||||
description:
|
||||
- Specify the timeout Ansible should use in requests to the controller host.
|
||||
- Defaults to 10s, but this is handled by the shared module_utils code
|
||||
type: float
|
||||
aliases: [ aap_request_timeout ]
|
||||
controller_config_file:
|
||||
description:
|
||||
- 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
|
||||
|
||||
Reference in New Issue
Block a user