From a0cfbb93e9325672c6d195cd2d634fa52248cb3f Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Mon, 2 Oct 2017 14:30:26 -0400 Subject: [PATCH] fix busted 3.2.2 activity stream migration see: ansible/ansible-tower#7704 --- awx/main/migrations/0007_v320_data_migrations.py | 3 ++- ...0009_v322_add_setting_field_for_activity_stream.py} | 2 +- ...y => 0010_v322_add_support_for_ovirt4_inventory.py} | 2 +- awx/main/migrations/__init__.py | 10 ++++++++++ 4 files changed, 14 insertions(+), 3 deletions(-) rename awx/main/migrations/{0010_v322_add_setting_field_for_activity_stream.py => 0009_v322_add_setting_field_for_activity_stream.py} (86%) rename awx/main/migrations/{0009_v322_add_support_for_ovirt4_inventory.py => 0010_v322_add_support_for_ovirt4_inventory.py} (95%) diff --git a/awx/main/migrations/0007_v320_data_migrations.py b/awx/main/migrations/0007_v320_data_migrations.py index 9461e81bcb..e8ede86ba9 100644 --- a/awx/main/migrations/0007_v320_data_migrations.py +++ b/awx/main/migrations/0007_v320_data_migrations.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals from django.db import migrations, models # AWX +from awx.main.migrations import ActivityStreamDisabledMigration from awx.main.migrations import _inventory_source as invsrc from awx.main.migrations import _migration_utils as migration_utils from awx.main.migrations import _reencrypt as reencrypt @@ -15,7 +16,7 @@ from awx.main.migrations import _azure_credentials as azurecreds import awx.main.fields -class Migration(migrations.Migration): +class Migration(ActivityStreamDisabledMigration): dependencies = [ ('main', '0006_v320_release'), diff --git a/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py b/awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py similarity index 86% rename from awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py rename to awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py index ad3856567a..3d69de2b33 100644 --- a/awx/main/migrations/0010_v322_add_setting_field_for_activity_stream.py +++ b/awx/main/migrations/0009_v322_add_setting_field_for_activity_stream.py @@ -8,7 +8,7 @@ import awx.main.fields class Migration(migrations.Migration): dependencies = [ - ('main', '0009_v322_add_support_for_ovirt4_inventory'), + ('main', '0008_v320_drop_v1_credential_fields'), ] operations = [ diff --git a/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py b/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py similarity index 95% rename from awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py rename to awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py index e29bdfb4d3..e6db61e4b8 100644 --- a/awx/main/migrations/0009_v322_add_support_for_ovirt4_inventory.py +++ b/awx/main/migrations/0010_v322_add_support_for_ovirt4_inventory.py @@ -10,7 +10,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('main', '0008_v320_drop_v1_credential_fields'), + ('main', '0009_v322_add_setting_field_for_activity_stream'), ] operations = [ diff --git a/awx/main/migrations/__init__.py b/awx/main/migrations/__init__.py index 709b95a6a6..2ea54e7880 100644 --- a/awx/main/migrations/__init__.py +++ b/awx/main/migrations/__init__.py @@ -1,2 +1,12 @@ # Copyright (c) 2016 Ansible, Inc. # All Rights Reserved. + +from django.db.migrations import Migration + + +class ActivityStreamDisabledMigration(Migration): + + def apply(self, project_state, schema_editor, collect_sql=False): + from awx.main.signals import disable_activity_stream + with disable_activity_stream(): + return Migration.apply(self, project_state, schema_editor, collect_sql)