Merge pull request #6254 from ryanpetrello/devel

squash together a few credential-related migrations

awx/main/migrations/0040_v320_add_credentialtype_model.py

@@ -60,6 +60,21 @@ class Migration(migrations.Migration):
             name='vault_credential',
             field=models.ForeignKey(related_name='jobtemplates_as_vault_credential+', on_delete=django.db.models.deletion.SET_NULL, default=None, blank=True, to='main.Credential', null=True),
         ),
+        migrations.AddField(
+            model_name='job',
+            name='extra_credentials',
+            field=models.ManyToManyField(related_name='_job_extra_credentials_+', to='main.Credential'),
+        ),
+        migrations.AddField(
+            model_name='jobtemplate',
+            name='extra_credentials',
+            field=models.ManyToManyField(related_name='_jobtemplate_extra_credentials_+', to='main.Credential'),
+        ),
+        migrations.AddField(
+            model_name='jobtemplate',
+            name='ask_extra_credentials_on_launch',
+            field=models.BooleanField(default=False),
+        ),
         migrations.AlterUniqueTogether(
             name='credential',
             unique_together=set([('organization', 'name', 'credential_type')]),

awx/main/migrations/0041_v320_migrate_v1_credentials.py

@@ -13,4 +13,5 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(credentialtypes.migrate_to_v2_credentials),
+        migrations.RunPython(credentialtypes.migrate_job_credentials),
     ]

awx/main/migrations/0042_v320_drop_v1_credential_fields.py

@@ -106,4 +106,20 @@ class Migration(migrations.Migration):
             name='inputs',
             field=awx.main.fields.CredentialInputField(default={}, help_text='Data structure used to specify input values (e.g., {"username": "jane-doe", "password": "secret"}).  Valid fields and their requirements vary depending on the fields defined on the chosen CredentialType.', blank=True),
         ),
+        migrations.RemoveField(
+            model_name='job',
+            name='cloud_credential',
+        ),
+        migrations.RemoveField(
+            model_name='job',
+            name='network_credential',
+        ),
+        migrations.RemoveField(
+            model_name='jobtemplate',
+            name='cloud_credential',
+        ),
+        migrations.RemoveField(
+            model_name='jobtemplate',
+            name='network_credential',
+        ),
     ]

awx/main/migrations/0043_v320_instancegroups.py

@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0043_v320_job_template_multi_credential'),
+        ('main', '0042_v320_drop_v1_credential_fields'),
     ]
 
     operations = [

awx/main/migrations/0043_v320_job_template_multi_credential.py

@@ -1,47 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-from awx.main.migrations import _credentialtypes as credentialtypes
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('main', '0042_v320_drop_v1_credential_fields'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='job',
-            name='extra_credentials',
-            field=models.ManyToManyField(related_name='_job_extra_credentials_+', to='main.Credential'),
-        ),
-        migrations.AddField(
-            model_name='jobtemplate',
-            name='extra_credentials',
-            field=models.ManyToManyField(related_name='_jobtemplate_extra_credentials_+', to='main.Credential'),
-        ),
-        migrations.AddField(
-            model_name='jobtemplate',
-            name='ask_extra_credentials_on_launch',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.RunPython(credentialtypes.migrate_job_credentials),
-        migrations.RemoveField(
-            model_name='job',
-            name='cloud_credential',
-        ),
-        migrations.RemoveField(
-            model_name='job',
-            name='network_credential',
-        ),
-        migrations.RemoveField(
-            model_name='jobtemplate',
-            name='cloud_credential',
-        ),
-        migrations.RemoveField(
-            model_name='jobtemplate',
-            name='network_credential',
-        ),
-    ]