diff --git a/awx/main/migrations/0014_v300_invsource_cred.py b/awx/main/migrations/0014_v300_invsource_cred.py index 20df511b5e..02a757dd16 100644 --- a/awx/main/migrations/0014_v300_invsource_cred.py +++ b/awx/main/migrations/0014_v300_invsource_cred.py @@ -36,17 +36,17 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='credential', name='kind', - field=models.CharField(default=b'ssh', max_length=32, choices=[(b'ssh', 'Machine'), (b'net', 'Network'), (b'scm', 'Source Control'), (b'aws', 'Amazon Web Services'), (b'rax', 'Rackspace'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Satellite 6'), (b'cloudforms', 'CloudForms'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'openstack', 'OpenStack')]), + field=models.CharField(default=b'ssh', max_length=32, choices=[(b'ssh', 'Machine'), (b'net', 'Network'), (b'scm', 'Source Control'), (b'aws', 'Amazon Web Services'), (b'rax', 'Rackspace'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'openstack', 'OpenStack')]), ), migrations.AlterField( model_name='inventorysource', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'Local File, Directory or Script'), (b'rax', 'Rackspace Cloud Servers'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Satellite 6'), (b'cloudforms', 'CloudForms'), (b'openstack', 'OpenStack'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'Local File, Directory or Script'), (b'rax', 'Rackspace Cloud Servers'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'custom', 'Custom Script')]), ), migrations.AlterField( model_name='inventoryupdate', name='source', - field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'Local File, Directory or Script'), (b'rax', 'Rackspace Cloud Servers'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Satellite 6'), (b'cloudforms', 'CloudForms'), (b'openstack', 'OpenStack'), (b'custom', 'Custom Script')]), + field=models.CharField(default=b'', max_length=32, blank=True, choices=[(b'', 'Manual'), (b'file', 'Local File, Directory or Script'), (b'rax', 'Rackspace Cloud Servers'), (b'ec2', 'Amazon EC2'), (b'gce', 'Google Compute Engine'), (b'azure', 'Microsoft Azure'), (b'vmware', 'VMware vCenter'), (b'foreman', 'Red Hat Satellite 6'), (b'cloudforms', 'Red Hat CloudForms'), (b'openstack', 'OpenStack'), (b'custom', 'Custom Script')]), ), migrations.AlterField( model_name='team', diff --git a/awx/main/models/credential.py b/awx/main/models/credential.py index bd24a72de5..f4fa421fcf 100644 --- a/awx/main/models/credential.py +++ b/awx/main/models/credential.py @@ -38,8 +38,8 @@ class Credential(PasswordFieldsModel, CommonModelNameNotUnique, ResourceMixin): ('aws', _('Amazon Web Services')), ('rax', _('Rackspace')), ('vmware', _('VMware vCenter')), - ('foreman', _('Satellite 6')), - ('cloudforms', _('CloudForms')), + ('foreman', _('Red Hat Satellite 6')), + ('cloudforms', _('Red Hat CloudForms')), ('gce', _('Google Compute Engine')), ('azure', _('Microsoft Azure')), ('openstack', _('OpenStack')), diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index c42bb77967..af8faad8da 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -750,8 +750,8 @@ class InventorySourceOptions(BaseModel): ('gce', _('Google Compute Engine')), ('azure', _('Microsoft Azure')), ('vmware', _('VMware vCenter')), - ('foreman', _('Satellite 6')), - ('cloudforms', _('CloudForms')), + ('foreman', _('Red Hat Satellite 6')), + ('cloudforms', _('Red Hat CloudForms')), ('openstack', _('OpenStack')), ('custom', _('Custom Script')), ]