From 8241ebbc9a2b5e9b0f35978038d3c1524a6860dd Mon Sep 17 00:00:00 2001
From: Alan Rominger <arominge@redhat.com>
Date: Sat, 17 Apr 2021 10:54:07 -0400
Subject: [PATCH] Fix migration order of operations bug

---
 .../migrations/0137_custom_inventory_scripts_removal_data.py   | 2 --
 awx/main/migrations/0138_custom_inventory_scripts_removal.py   | 3 +++
 awx/main/migrations/_rbac.py                                   | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx/main/migrations/0137_custom_inventory_scripts_removal_data.py b/awx/main/migrations/0137_custom_inventory_scripts_removal_data.py
index bb965de3ab..46490d2517 100644
--- a/awx/main/migrations/0137_custom_inventory_scripts_removal_data.py
+++ b/awx/main/migrations/0137_custom_inventory_scripts_removal_data.py
@@ -3,7 +3,6 @@
 from django.db import migrations
 
 # AWX migration utils
-from awx.main.migrations._rbac import delete_all_custom_script_roles
 from awx.main.migrations._inventory_source import delete_custom_inv_source
 
 
@@ -15,5 +14,4 @@ class Migration(migrations.Migration):
 
     operations = [
         migrations.RunPython(delete_custom_inv_source),
-        migrations.RunPython(delete_all_custom_script_roles),
     ]
diff --git a/awx/main/migrations/0138_custom_inventory_scripts_removal.py b/awx/main/migrations/0138_custom_inventory_scripts_removal.py
index fb781c8648..8dddf46667 100644
--- a/awx/main/migrations/0138_custom_inventory_scripts_removal.py
+++ b/awx/main/migrations/0138_custom_inventory_scripts_removal.py
@@ -2,6 +2,8 @@
 
 from django.db import migrations, models
 
+from awx.main.migrations._rbac import delete_all_custom_script_roles
+
 
 class Migration(migrations.Migration):
 
@@ -78,4 +80,5 @@ class Migration(migrations.Migration):
             model_name='custominventoryscript',
             name='read_role',
         ),
+        migrations.RunPython(delete_all_custom_script_roles),
     ]
diff --git a/awx/main/migrations/_rbac.py b/awx/main/migrations/_rbac.py
index 7f120645ef..96e6334d83 100644
--- a/awx/main/migrations/_rbac.py
+++ b/awx/main/migrations/_rbac.py
@@ -59,7 +59,7 @@ def delete_all_custom_script_roles(apps, schema_editor):
         role.delete()
         role_ct += 1
     if role_ct:
-        logger.debug('Deleted roles corresponding to custom inventory sources.')
+        logger.debug('Deleted {} roles corresponding to custom inventory sources.'.format(role_ct))
 
 
 UNIFIED_ORG_LOOKUPS = {