From 0d0c75c3180633c8ad6c29a1540a03959a9e501e Mon Sep 17 00:00:00 2001 From: adamscmRH Date: Thu, 13 Jul 2017 13:55:42 -0400 Subject: [PATCH] Change to update if already exists --- awx/main/management/commands/inventory_import.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/management/commands/inventory_import.py b/awx/main/management/commands/inventory_import.py index 575fb8d714..42612e185e 100644 --- a/awx/main/management/commands/inventory_import.py +++ b/awx/main/management/commands/inventory_import.py @@ -624,7 +624,7 @@ class Command(NoArgsCommand): if group_name in existing_group_names: continue mem_group = self.all_group.all_groups[group_name] - group = self.inventory.groups.get_or_create(name=group_name, defaults={'variables':json.dumps(mem_group.variables), 'description':'imported'})[0] + group = self.inventory.groups.update_or_create(name=group_name, defaults={'variables':json.dumps(mem_group.variables), 'description':'imported'})[0] logger.info('Group "%s" added', group.name) self._batch_add_m2m(self.inventory_source.groups, group) self._batch_add_m2m(self.inventory_source.groups, flush=True) @@ -755,7 +755,8 @@ class Command(NoArgsCommand): if self.instance_id_var: instance_id = self._get_instance_id(mem_host.variables) host_attrs['instance_id'] = instance_id - db_host = self.inventory.hosts.get_or_create(name=mem_host_name, defaults={'variables':json.dumps(host_attrs)})[0] + db_host = self.inventory.hosts.update_or_create(name=mem_host_name, + defaults={'variables':host_attrs['variables'], 'description':host_attrs['description']})[0] if enabled is False: logger.info('Host "%s" added (disabled)', mem_host_name) else: