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

Merge pull request #6979 from rooftopcellist/IntegrityError

Browse Source 
Fix IntegrityError on Source Update
This commit is contained in:
Christian Adams
2017-07-14 06:45:31 -07:00
committed by GitHub
parent a8ad5cc2f7 d065d5176e
commit f5bbccf0cd
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,7 +619,7 @@ class Command(NoArgsCommand):
if group_name in existing_group_names: if group_name in existing_group_names:
continue continue
mem_group = self.all_group.all_groups[group_name] mem_group = self.all_group.all_groups[group_name]
group = self.inventory.groups.create(name=group_name, variables=json.dumps(mem_group.variables), description='imported') 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) logger.info('Group "%s" added', group.name)
self._batch_add_m2m(self.inventory_source.groups, group) self._batch_add_m2m(self.inventory_source.groups, group)
self._batch_add_m2m(self.inventory_source.groups, flush=True) self._batch_add_m2m(self.inventory_source.groups, flush=True)
@@ -741,14 +741,15 @@ class Command(NoArgsCommand):
for mem_host_name in sorted(mem_host_names_to_update): for mem_host_name in sorted(mem_host_names_to_update):
mem_host = self.all_group.all_hosts[mem_host_name] mem_host = self.all_group.all_hosts[mem_host_name]
host_attrs = dict(variables=json.dumps(mem_host.variables), host_attrs = dict(variables=json.dumps(mem_host.variables),
name=mem_host_name, description='imported') description='imported')
enabled = self._get_enabled(mem_host.variables) enabled = self._get_enabled(mem_host.variables)
if enabled is not None: if enabled is not None:
host_attrs['enabled'] = enabled host_attrs['enabled'] = enabled
if self.instance_id_var: if self.instance_id_var:
instance_id = self._get_instance_id(mem_host.variables) instance_id = self._get_instance_id(mem_host.variables)
host_attrs['instance_id'] = instance_id host_attrs['instance_id'] = instance_id
db_host = self.inventory.hosts.create(**host_attrs) 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: if enabled is False:
logger.info('Host "%s" added (disabled)', mem_host_name) logger.info('Host "%s" added (disabled)', mem_host_name)
else: else:
@@ -762,6 +763,7 @@ class Command(NoArgsCommand):
len(connection.queries) - queries_before, len(connection.queries) - queries_before,
len(self.all_group.all_hosts)) len(self.all_group.all_hosts))
@transaction.atomic
def _create_update_group_children(self): def _create_update_group_children(self):
''' '''
For each imported group, create all parent-child group relationships. For each imported group, create all parent-child group relationships.
@@ -789,6 +791,7 @@ class Command(NoArgsCommand):
logger.warning('Group-group updates took %d queries for %d group-group relationships', logger.warning('Group-group updates took %d queries for %d group-group relationships',
len(connection.queries) - queries_before, group_group_count) len(connection.queries) - queries_before, group_group_count)
@transaction.atomic
def _create_update_group_hosts(self): def _create_update_group_hosts(self):
# For each host in a mem group, add it to the parent(s) to which it # For each host in a mem group, add it to the parent(s) to which it
# belongs. # belongs.