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

Be more strict on inventory checking on inventory import.

Browse Source
This commit is contained in:
Michael DeHaan
2013-07-18 10:47:54 -04:00
parent c3561e0137
commit e586bd9754
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,6 +331,7 @@ class ExecutableJsonLoader(BaseLoader):
class GenericLoader(object): class GenericLoader(object):
def __init__(self, src): def __init__(self, src):
LOGGER.debug("preparing loaders") LOGGER.debug("preparing loaders")
@@ -459,21 +460,18 @@ class Command(BaseCommand):
# list, delete it # list, delete it
if overwrite: if overwrite:
LOGGER.info("deleting any hosts not in the remote source: %s" % host_names.keys()) LOGGER.info("deleting any hosts not in the remote source: %s" % host_names.keys())
Host.objects.exclude(name__in = host_names.keys()).delete() Host.objects.exclude(name__in = host_names.keys()).filter(inventory=inventory).delete()
# if overwrite is set, for each group in the database but NOT in the local # if overwrite is set, for each group in the database but NOT in the local
# list, delete it # list, delete it
if overwrite: if overwrite:
LOGGER.info("deleting any groups not in the remote source") LOGGER.info("deleting any groups not in the remote source")
Group.objects.exclude(name__in = group_names.keys()).delete() Group.objects.exclude(name__in = group_names.keys()).filter(inventory=inventory).delete()
# if overwrite is set, throw away all invalid child relationships for groups # if overwrite is set, throw away all invalid child relationships for groups
if overwrite: if overwrite:
LOGGER.info("clearing any child relationships to rebuild from remote source") LOGGER.info("clearing any child relationships to rebuild from remote source")
db_groups = Group.objects.all() db_groups = Group.objects.filter(inventory=inventory)
#for g in db_groups:
# g.children.clear()
# g.save()
for db_group in db_groups: for db_group in db_groups:
db_kids = db_group.children.all() db_kids = db_group.children.all()