Merge pull request #4053 from AlanCoding/apps_management

Correctly manage current apps for the action_node addition

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/migrations/0061_v350_track_native_credentialtype_source.py

@@ -5,9 +5,11 @@ from __future__ import unicode_literals
 from django.db import migrations, models
 
 from awx.main.models import CredentialType
+from awx.main.utils.common import set_current_apps
 
 
 def migrate_to_static_inputs(apps, schema_editor):
+    set_current_apps(apps)
     CredentialType.setup_tower_managed_defaults()
 
 

awx/main/migrations/0067_v350_credential_plugins.py

@@ -9,9 +9,11 @@ import taggit.managers
 # AWX
 import awx.main.fields
 from awx.main.models import CredentialType
+from awx.main.utils.common import set_current_apps
 
 
 def setup_tower_managed_defaults(apps, schema_editor):
+    set_current_apps(apps)
     CredentialType.setup_tower_managed_defaults()
 
 

awx/main/migrations/0080_v360_replace_job_origin.py

@@ -4,6 +4,8 @@ from __future__ import unicode_literals
 
 from django.db import migrations, models
 
+from awx.main.utils.common import set_current_apps
+
 
 class Migration(migrations.Migration):
 
@@ -12,6 +14,7 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RunPython(migrations.RunPython.noop, lambda apps, schema_editor: set_current_apps(apps)),
         migrations.RemoveField(
             model_name='joborigin',
             name='instance',
@@ -28,4 +31,5 @@ class Migration(migrations.Migration):
         migrations.DeleteModel(
             name='JobOrigin',
         ),
+        migrations.RunPython(lambda apps, schema_editor: set_current_apps(apps), migrations.RunPython.noop)
     ]