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

Merge pull request #107 from jangsutsr/7334_make_up_missing_create_kwargs_for_inv_import

Browse Source 
Make up missing create kwargs in inventory import
This commit is contained in:
Aaron Tan
2017-08-01 20:32:26 -04:00
committed by GitHub
parent 57375dc7f1 48c3cfad9e
commit c44fe85fe2
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,7 +619,13 @@ 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.update_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) 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)
@@ -748,8 +754,7 @@ class Command(NoArgsCommand):
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.update_or_create(name=mem_host_name, db_host = self.inventory.hosts.update_or_create(name=mem_host_name, defaults=host_attrs)[0]
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: