mirror of
https://github.com/ansible/awx.git
synced 2026-03-18 01:17:35 -02:30
fix busted 3.2.2 activity stream migration
see: ansible/ansible-tower#7704
This commit is contained in:
committed by
Matthew Jones
parent
4ea92f0dcb
commit
a0cfbb93e9
@@ -6,6 +6,7 @@ from __future__ import unicode_literals
|
|||||||
from django.db import migrations, models
|
from django.db import migrations, models
|
||||||
|
|
||||||
# AWX
|
# AWX
|
||||||
|
from awx.main.migrations import ActivityStreamDisabledMigration
|
||||||
from awx.main.migrations import _inventory_source as invsrc
|
from awx.main.migrations import _inventory_source as invsrc
|
||||||
from awx.main.migrations import _migration_utils as migration_utils
|
from awx.main.migrations import _migration_utils as migration_utils
|
||||||
from awx.main.migrations import _reencrypt as reencrypt
|
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
|
import awx.main.fields
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(ActivityStreamDisabledMigration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('main', '0006_v320_release'),
|
('main', '0006_v320_release'),
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import awx.main.fields
|
|||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('main', '0009_v322_add_support_for_ovirt4_inventory'),
|
('main', '0008_v320_drop_v1_credential_fields'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
@@ -10,7 +10,7 @@ from django.db import migrations, models
|
|||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('main', '0008_v320_drop_v1_credential_fields'),
|
('main', '0009_v322_add_setting_field_for_activity_stream'),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
@@ -1,2 +1,12 @@
|
|||||||
# Copyright (c) 2016 Ansible, Inc.
|
# Copyright (c) 2016 Ansible, Inc.
|
||||||
# All Rights Reserved.
|
# 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)
|
||||||
|
|||||||
Reference in New Issue
Block a user