External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-02 02:49:58 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #190 from AlanCoding/no_inv_src_ig

Browse Source 
do not use inventory source instance groups
This commit is contained in:
Alan Rominger
2017-08-08 09:14:15 -04:00
committed by GitHub
parent 9f63624292 aca1efa552
commit 40c01d9ba7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/models/inventory.py
View File

@@ -1533,8 +1533,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