From 83b985ed2e1da780555a49ae350ad0b47b89a996 Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Mon, 12 Dec 2016 15:12:16 -0500
Subject: [PATCH] tower settings removal depends on conf migration

---
 .../0002_v310_copy_tower_settings.py          |  4 +--
 awx/main/migrations/0034_v310_release.py      |  8 ------
 .../0035_v310_remove_tower_settings.py        | 27 +++++++++++++++++++
 3 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 awx/main/migrations/0035_v310_remove_tower_settings.py

diff --git a/awx/conf/migrations/0002_v310_copy_tower_settings.py b/awx/conf/migrations/0002_v310_copy_tower_settings.py
index 4493007f70..7cf24b7061 100644
--- a/awx/conf/migrations/0002_v310_copy_tower_settings.py
+++ b/awx/conf/migrations/0002_v310_copy_tower_settings.py
@@ -64,11 +64,11 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('conf', '0001_initial'),
-        ('main', '0036_v310_jobevent_uuid'),
+        ('main', '0034_v310_release'),
     ]
 
     run_before = [
-        ('main', '0037_v310_remove_tower_settings'),
+        ('main', '0035_v310_remove_tower_settings'),
     ]
 
     operations = [
diff --git a/awx/main/migrations/0034_v310_release.py b/awx/main/migrations/0034_v310_release.py
index e86691d2e1..480f5dda06 100644
--- a/awx/main/migrations/0034_v310_release.py
+++ b/awx/main/migrations/0034_v310_release.py
@@ -31,14 +31,6 @@ class Migration(migrations.Migration):
             name='allow_simultaneous',
             field=models.BooleanField(default=False),
         ),
-        # Remove Tower settings, these settings are now in separate awx.conf app.
-        migrations.RemoveField(
-            model_name='towersettings',
-            name='user',
-        ),
-        migrations.DeleteModel(
-            name='TowerSettings',
-        ),
         # Job Event UUID
         migrations.AddField(
             model_name='jobevent',
diff --git a/awx/main/migrations/0035_v310_remove_tower_settings.py b/awx/main/migrations/0035_v310_remove_tower_settings.py
new file mode 100644
index 0000000000..bdb0d284fa
--- /dev/null
+++ b/awx/main/migrations/0035_v310_remove_tower_settings.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import awx.main.models.notifications
+import jsonfield.fields
+import django.db.models.deletion
+import awx.main.models.workflow
+import awx.main.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0034_v310_release'),
+    ]
+
+    operations = [
+        # Remove Tower settings, these settings are now in separate awx.conf app.
+        migrations.RemoveField(
+            model_name='towersettings',
+            name='user',
+        ),
+        migrations.DeleteModel(
+            name='TowerSettings',
+        ),
+    ]