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

Merge pull request #8442 from beeankha/revert_to_satellite6

Browse Source 
Revert "Kind" Choice from 'satellite' to 'satellite6'

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot] 2020-10-23 13:54:11 +00:00 committed by GitHub
commit 20e2472329
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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", "satellite", "rhv", "vmware", "aim", "conjur", "hashivault_kv", "hashivault_ssh",
choices: ["aws", "tower", "gce", "azure_rm", "openstack", "cloudforms", "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:
@ -285,7 +285,7 @@ KIND_CHOICES = {
'azure_rm': 'Microsoft Azure Resource Manager',
'openstack': 'OpenStack',
'cloudforms': 'Red Hat CloudForms',
'satellite': 'Red Hat Satellite 6',
'satellite6': 'Red Hat Satellite 6',
'rhv': 'Red Hat Virtualization',
'vmware': 'VMware vCenter',
'aim': 'CyberArk AIM Central Credential Provider Lookup',