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

Fix a bug where we could potentially not see a hostname that we need to

Browse Source 
update instead of create when syncing inventory because its instance id
had changed
This commit is contained in:
Matthew Jones
2014-09-24 13:32:20 -04:00
parent 6f2a33d2b7
commit 9064bb3107
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -955,14 +955,13 @@ class Command(NoArgsCommand):
mem_host_names_to_update = set(self.all_group.all_hosts.keys()) mem_host_names_to_update = set(self.all_group.all_hosts.keys())
for k,v in self.all_group.all_hosts.iteritems(): for k,v in self.all_group.all_hosts.iteritems():
instance_id = '' instance_id = ''
mem_host_name_map[k] = v
if self.instance_id_var: if self.instance_id_var:
instance_id = v.variables.get(self.instance_id_var, '') instance_id = v.variables.get(self.instance_id_var, '')
if instance_id in self.db_instance_id_map: if instance_id in self.db_instance_id_map:
mem_host_pk_map[self.db_instance_id_map[instance_id]] = v mem_host_pk_map[self.db_instance_id_map[instance_id]] = v
elif instance_id: elif instance_id:
mem_host_instance_id_map[instance_id] = v mem_host_instance_id_map[instance_id] = v
else:
mem_host_name_map[k] = v
# Update all existing hosts where we know the PK based on instance_id. # Update all existing hosts where we know the PK based on instance_id.
all_host_pks = sorted(mem_host_pk_map.keys()) all_host_pks = sorted(mem_host_pk_map.keys())