From aca1efa552e06795c4a4cd1c635942e68f38d598 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Fri, 4 Aug 2017 12:34:29 -0400 Subject: [PATCH] do not use inventory source instance groups --- awx/main/models/inventory.py | 3 +-- awx/main/tests/functional/test_instances.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 660893ebf1..6ff6583952 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1522,8 +1522,7 @@ class InventoryUpdate(UnifiedJob, InventorySourceOptions, JobNotificationMixin, organization_groups = [] if self.inventory_source.inventory is not None: inventory_groups = [x for x in self.inventory_source.inventory.instance_groups.all()] - template_groups = [x for x in super(InventoryUpdate, self).preferred_instance_groups] - selected_groups = template_groups + inventory_groups + organization_groups + selected_groups = inventory_groups + organization_groups if not selected_groups: return self.global_instance_groups return selected_groups diff --git a/awx/main/tests/functional/test_instances.py b/awx/main/tests/functional/test_instances.py index 6444d0d0d3..3454371037 100644 --- a/awx/main/tests/functional/test_instances.py +++ b/awx/main/tests/functional/test_instances.py @@ -87,7 +87,8 @@ class TestInstanceGroupOrdering: inventory_source.inventory.instance_groups.add(ig_inv) assert iu.preferred_instance_groups == [ig_inv, ig_org] inventory_source.instance_groups.add(ig_tmp) - assert iu.preferred_instance_groups == [ig_tmp, ig_inv, ig_org] + # API does not allow setting IGs on inventory source, so ignore those + assert iu.preferred_instance_groups == [ig_inv, ig_org] def test_project_update_instance_groups(self, instance_group_factory, project, default_instance_group): pu = ProjectUpdate.objects.create(project=project)