From 23b0adb34e499df70e45e7fc21f169dd55efd21c Mon Sep 17 00:00:00 2001 From: Michael DeHaan Date: Sun, 14 Jul 2013 17:21:41 -0400 Subject: [PATCH] Clean run of inventory import script. --- awx/main/management/commands/inventory_import.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 1be432eb11..4c1d7dc874 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -561,20 +561,21 @@ class Command(BaseCommand): if obj.name in mem_hash: mem_group = mem_hash[obj.name] db_variables = json.loads(obj.variables) - mem_variables = json.loads(mem_group.variables) + mem_variables = mem_group.variables if overwrite_vars or overwrite: db_variables = mem_variables else: db_variables.update(mem_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(Host, host_names, overwrite, overwrite_vars) # for each group, draw in child group arrangements # 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) for mem_child_group in v.child_groups: db_child = Group.objects.get(inventory=inventory, name=mem_child_group.name)