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

Clean run of inventory import script.

Browse Source
This commit is contained in:
Michael DeHaan
2013-07-14 17:21:41 -04:00
parent b0e9ab81af
commit 23b0adb34e
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -561,20 +561,21 @@ class Command(BaseCommand):
if obj.name in mem_hash: if obj.name in mem_hash:
mem_group = mem_hash[obj.name] mem_group = mem_hash[obj.name]
db_variables = json.loads(obj.variables) db_variables = json.loads(obj.variables)
mem_variables = json.loads(mem_group.variables) mem_variables = mem_group.variables
if overwrite_vars or overwrite: if overwrite_vars or overwrite:
db_variables = mem_variables db_variables = mem_variables
else: else:
db_variables.update(mem_variables) db_variables.update(mem_variables)
db_variables = json.dumps(db_variables) db_variables = json.dumps(db_variables)
obj.update(variables=db_variables) obj.variables = db_variables
obj.save()
variable_mangler(Group, group_names, overwrite, overwrite_vars) variable_mangler(Group, group_names, overwrite, overwrite_vars)
variable_mangler(Host, host_names, overwrite, overwrite_vars) variable_mangler(Host, host_names, overwrite, overwrite_vars)
# for each group, draw in child group arrangements # for each group, draw in child group arrangements
# FIXME: where they do not already exist # FIXME: where they do not already exist
for (k,v) in group_names: for (k,v) in group_names.iteritems():
db_group = Group.objects.get(inventory=inventory, name=k) db_group = Group.objects.get(inventory=inventory, name=k)
for mem_child_group in v.child_groups: for mem_child_group in v.child_groups:
db_child = Group.objects.get(inventory=inventory, name=mem_child_group.name) db_child = Group.objects.get(inventory=inventory, name=mem_child_group.name)