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

Merge pull request #6265 from djj106/devel

Browse Source 
Add support for importing host/group descriptions

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-05-28 01:53:03 +00:00
committed by GitHub
parent 6d46ee7a01 6cd4b1c666
commit 39b37817a1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -649,11 +649,12 @@ class Command(BaseCommand):
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_desc = mem_group.variables.pop('_awx_description', 'imported')
group = self.inventory.groups.update_or_create( group = self.inventory.groups.update_or_create(
name=group_name, name=group_name,
defaults={ defaults={
'variables':json.dumps(mem_group.variables), 'variables':json.dumps(mem_group.variables),
'description':'imported' 'description':group_desc
} }
)[0] )[0]
logger.debug('Group "%s" added', group.name) logger.debug('Group "%s" added', group.name)
@@ -776,8 +777,9 @@ class Command(BaseCommand):
# Create any new hosts. # Create any new hosts.
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), import_vars = mem_host.variables
description='imported') host_desc = import_vars.pop('_awx_description', 'imported')
host_attrs = dict(variables=json.dumps(import_vars), description=host_desc)
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