From c74d60f3f3b9488769e99bc22674eb8b6715ab4e Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 10 Dec 2020 11:42:52 -0500 Subject: [PATCH] Make sure that the new credential type is in the choices list --- awx/main/migrations/0125_more_ee_modeling_changes.py | 5 +++++ awx/main/models/credential/__init__.py | 1 + 2 files changed, 6 insertions(+) diff --git a/awx/main/migrations/0125_more_ee_modeling_changes.py b/awx/main/migrations/0125_more_ee_modeling_changes.py index 3d5a076d8d..be999cbb79 100644 --- a/awx/main/migrations/0125_more_ee_modeling_changes.py +++ b/awx/main/migrations/0125_more_ee_modeling_changes.py @@ -34,6 +34,11 @@ class Migration(migrations.Migration): name='default_environment', field=models.ForeignKey(blank=True, default=None, help_text='The default execution environment for jobs run using this project.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='main.ExecutionEnvironment'), ), + migrations.AlterField( + model_name='credentialtype', + name='kind', + field=models.CharField(choices=[('ssh', 'Machine'), ('vault', 'Vault'), ('net', 'Network'), ('scm', 'Source Control'), ('cloud', 'Cloud'), ('registry', 'Container Registry'), ('token', 'Personal Access Token'), ('insights', 'Insights'), ('external', 'External'), ('kubernetes', 'Kubernetes'), ('galaxy', 'Galaxy/Automation Hub')], max_length=32), + ), migrations.AlterUniqueTogether( name='executionenvironment', unique_together=set(), diff --git a/awx/main/models/credential/__init__.py b/awx/main/models/credential/__init__.py index 00af665969..7cdd9898d3 100644 --- a/awx/main/models/credential/__init__.py +++ b/awx/main/models/credential/__init__.py @@ -331,6 +331,7 @@ class CredentialType(CommonModelNameNotUnique): ('net', _('Network')), ('scm', _('Source Control')), ('cloud', _('Cloud')), + ('registry', _('Container Registry')), ('token', _('Personal Access Token')), ('insights', _('Insights')), ('external', _('External')),