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

Merge pull request #459 from AlanCoding/special_treatment

Browse Source 
always ignore deprecated_group if in groups
This commit is contained in:
Alan Rominger
2017-09-25 13:35:55 -04:00
committed by GitHub
parent 5bec43fc8e a4a17fe14c
commit 4c0fd573c6
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/management/commands/inventory_import.py
View File

@@ -513,6 +513,12 @@ class Command(NoArgsCommand):
group_names = all_group_names[offset:(offset + self._batch_size)] group_names = all_group_names[offset:(offset + self._batch_size)]
for group_pk in groups_qs.filter(name__in=group_names).values_list('pk', flat=True): for group_pk in groups_qs.filter(name__in=group_names).values_list('pk', flat=True):
del_group_pks.discard(group_pk) del_group_pks.discard(group_pk)
if self.inventory_source.deprecated_group_id in del_group_pks: # TODO: remove in 3.3
logger.warning(
'Group "%s" from v1 API is not deleted by overwrite',
self.inventory_source.deprecated_group.name
)
del_group_pks.discard(self.inventory_source.deprecated_group_id)
# Now delete all remaining groups in batches. # Now delete all remaining groups in batches.
all_del_pks = sorted(list(del_group_pks)) all_del_pks = sorted(list(del_group_pks))
for offset in xrange(0, len(all_del_pks), self._batch_size): for offset in xrange(0, len(all_del_pks), self._batch_size):
@@ -541,6 +547,12 @@ class Command(NoArgsCommand):
group_host_count = 0 group_host_count = 0
db_groups = self.inventory_source.groups db_groups = self.inventory_source.groups
for db_group in db_groups.all(): for db_group in db_groups.all():
if self.inventory_source.deprecated_group_id == db_group.id: # TODO: remove in 3.3
logger.info(
'Group "%s" from v1 API child group/host connections preserved',
db_group.name
)
continue
# Delete child group relationships not present in imported data. # Delete child group relationships not present in imported data.
db_children = db_group.children db_children = db_group.children
db_children_name_pk_map = dict(db_children.values_list('name', 'pk')) db_children_name_pk_map = dict(db_children.values_list('name', 'pk'))