zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-03-20 07:43:35 -05:00
Code Issues Packages Projects Releases Wiki Activity

initial start with notes from alan

Browse Source
This commit is contained in:
Gabe Muniz
2023-02-02 17:09:04 -05:00
parent c72dca3ea5
commit 27a97017dd
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/api/views/inventory.py
View File

@@ -98,12 +98,10 @@ class InventoryDetail(RelatedJobsPreventDeleteMixin, RetrieveUpdateDestroyAPIVie
class ConstructedInventoryDetail(InventoryDetail): class ConstructedInventoryDetail(InventoryDetail):
serializer_class = ConstructedInventorySerializer serializer_class = ConstructedInventorySerializer
class ConstructedInventoryList(InventoryList): class ConstructedInventoryList(InventoryList):
serializer_class = ConstructedInventorySerializer serializer_class = ConstructedInventorySerializer
def get_queryset(self): def get_queryset(self):

1
awx/main/migrations/0175_constructed_inventory.py
View File

@@ -4,7 +4,6 @@ from django.db import migrations, models
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
('main', '0174_ensure_org_ee_admin_roles'), ('main', '0174_ensure_org_ee_admin_roles'),
] ]

2
awx/main/tasks/jobs.py
View File

@@ -320,7 +320,7 @@ class BaseTask(object):
for hostname, hv in script_data.get('_meta', {}).get('hostvars', {}).items(): for hostname, hv in script_data.get('_meta', {}).get('hostvars', {}).items():
# maintain a list of host_name --> host_id # maintain a list of host_name --> host_id
# so we can associate emitted events to Host objects # so we can associate emitted events to Host objects
self.runner_callback.host_map[hostname] = hv.pop('remote_tower_id', '') self.runner_callback.host_map[hostname] = hv.get('remote_tower_id', '')
file_content = '#! /usr/bin/env python3\n# -*- coding: utf-8 -*-\nprint(%r)\n' % json.dumps(script_data) file_content = '#! /usr/bin/env python3\n# -*- coding: utf-8 -*-\nprint(%r)\n' % json.dumps(script_data)
return self.write_private_data_file(private_data_dir, file_name, file_content, sub_dir='inventory', file_permissions=0o700) return self.write_private_data_file(private_data_dir, file_name, file_content, sub_dir='inventory', file_permissions=0o700)

2
awx/settings/defaults.py
View File

@@ -747,6 +747,8 @@ SCM_EXCLUDE_EMPTY_GROUPS = False
# ---------------- # ----------------
# -- Constructed -- # -- Constructed --
# ---------------- # ----------------
CONSTRUCTED_INSTANCE_ID_VAR = 'remote_tower_id'
CONSTRUCTED_EXCLUDE_EMPTY_GROUPS = False CONSTRUCTED_EXCLUDE_EMPTY_GROUPS = False
# --------------------- # ---------------------