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

Merge remote-tracking branch 'downstream' into downstream

Browse Source
This commit is contained in:
Ryan Petrello
2020-11-11 13:30:21 -05:00
parent 4d480cb95f ddd109059f
commit 4d8176e6af
5 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx_collection/plugins/modules/tower_credential.py
View File

@@ -74,7 +74,7 @@ options:
- Deprecated, please use credential_type
required: False
type: str
choices: ["aws", "tower", "gce", "azure_rm", "openstack", "cloudforms", "satellite6", "rhv", "vmware", "aim", "conjur", "hashivault_kv", "hashivault_ssh",
choices: ["aws", "tower", "gce", "azure_rm", "openstack", "satellite6", "rhv", "vmware", "aim", "conjur", "hashivault_kv", "hashivault_ssh",
"azure_kv", "insights", "kubernetes_bearer_token", "net", "scm", "ssh", "github_token", "gitlab_token", "vault"]
host:
description:
@@ -284,7 +284,6 @@ KIND_CHOICES = {
'gce': 'Google Compute Engine',
'azure_rm': 'Microsoft Azure Resource Manager',
'openstack': 'OpenStack',
'cloudforms': 'Red Hat CloudForms',
'satellite6': 'Red Hat Satellite 6',
'rhv': 'Red Hat Virtualization',
'vmware': 'VMware vCenter',