From e81a7e1c2575ac30b747bd8c5eefce4dabb7121f Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 18 May 2017 11:31:58 -0400 Subject: [PATCH 1/2] allow insights_system_id to be set to null via api --- awx/api/serializers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/awx/api/serializers.py b/awx/api/serializers.py index 72b33057fe..67cc56f4b2 100644 --- a/awx/api/serializers.py +++ b/awx/api/serializers.py @@ -1174,6 +1174,7 @@ class InventoryScriptSerializer(InventorySerializer): class HostSerializer(BaseSerializerWithVariables): show_capabilities = ['edit', 'delete'] + insights_system_id = serializers.CharField(allow_blank=True, allow_null=True, required=False, default=None) class Meta: model = Host From 136bdc06e9f4c7efa895b0f7e51ca2532d3059fd Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Thu, 18 May 2017 12:50:51 -0400 Subject: [PATCH 2/2] remove insights_system_id uniqueness constraint --- awx/main/migrations/0038_v320_release.py | 4 ---- awx/main/models/inventory.py | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/awx/main/migrations/0038_v320_release.py b/awx/main/migrations/0038_v320_release.py index ec8c0e4a8e..f0006d3f33 100644 --- a/awx/main/migrations/0038_v320_release.py +++ b/awx/main/migrations/0038_v320_release.py @@ -243,8 +243,4 @@ class Migration(migrations.Migration): name='insights_system_id', field=models.TextField(default=None, help_text='Red Hat Insights host unique identifier.', null=True, db_index=True, blank=True), ), - migrations.AlterUniqueTogether( - name='host', - unique_together=set([('insights_system_id', 'inventory'), ('name', 'inventory')]), - ), ] diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 3326fc44b4..4b4f867a44 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -353,7 +353,7 @@ class Host(CommonModelNameNotUnique): class Meta: app_label = 'main' - unique_together = (("name", "inventory"), ("insights_system_id", "inventory"),) # FIXME: Add ('instance_id', 'inventory') after migration. + unique_together = (("name", "inventory"),) # FIXME: Add ('instance_id', 'inventory') after migration. ordering = ('name',) inventory = models.ForeignKey(