From ddf3265bd277481a18f0bb4654a69e49743679bc Mon Sep 17 00:00:00 2001
From: Akita Noek <anoek@ansible.com>
Date: Wed, 9 Mar 2016 16:03:57 -0500
Subject: [PATCH] Reordered system job template migration to happen after rbac
 migrations

The system job template migration creates SystemJobTemplate instances,
which necessarily depend on the RBAC modifications.
---
 .../{0007_v300_rbac_changes.py => 0006_v300_rbac_changes.py}  | 2 +-
 ...8_v300_rbac_migrations.py => 0007_v300_rbac_migrations.py} | 2 +-
 .../migrations/{0006_v300_changes.py => 0009_v300_changes.py} | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename awx/main/migrations/{0007_v300_rbac_changes.py => 0006_v300_rbac_changes.py} (99%)
 rename awx/main/migrations/{0008_v300_rbac_migrations.py => 0007_v300_rbac_migrations.py} (92%)
 rename awx/main/migrations/{0006_v300_changes.py => 0009_v300_changes.py} (97%)

diff --git a/awx/main/migrations/0007_v300_rbac_changes.py b/awx/main/migrations/0006_v300_rbac_changes.py
similarity index 99%
rename from awx/main/migrations/0007_v300_rbac_changes.py
rename to awx/main/migrations/0006_v300_rbac_changes.py
index 1d8f9cf2c5..d9313fe8aa 100644
--- a/awx/main/migrations/0007_v300_rbac_changes.py
+++ b/awx/main/migrations/0006_v300_rbac_changes.py
@@ -14,7 +14,7 @@ class Migration(migrations.Migration):
         ('taggit', '0002_auto_20150616_2121'),
         ('contenttypes', '0002_remove_content_type_name'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('main', '0006_v300_changes'),
+        ('main', '0005_v300_active_flag_removal'),
     ]
 
     operations = [
diff --git a/awx/main/migrations/0008_v300_rbac_migrations.py b/awx/main/migrations/0007_v300_rbac_migrations.py
similarity index 92%
rename from awx/main/migrations/0008_v300_rbac_migrations.py
rename to awx/main/migrations/0007_v300_rbac_migrations.py
index 7226c31e1b..d50069ab48 100644
--- a/awx/main/migrations/0008_v300_rbac_migrations.py
+++ b/awx/main/migrations/0007_v300_rbac_migrations.py
@@ -8,7 +8,7 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0007_v300_rbac_changes'),
+        ('main', '0006_v300_rbac_changes'),
     ]
 
     operations = [
diff --git a/awx/main/migrations/0006_v300_changes.py b/awx/main/migrations/0009_v300_changes.py
similarity index 97%
rename from awx/main/migrations/0006_v300_changes.py
rename to awx/main/migrations/0009_v300_changes.py
index 4162ff3bd1..578dc10653 100644
--- a/awx/main/migrations/0006_v300_changes.py
+++ b/awx/main/migrations/0009_v300_changes.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
+from django.db import migrations
 from django.utils.timezone import now
 
 from awx.api.license import feature_enabled
@@ -107,7 +107,7 @@ def create_system_job_templates(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('main', '0005_v300_active_flag_removal'),
+        ('main', '0008_v300_rbac_drop_fields'),
     ]
 
     operations = [