Skip to content

Commit

Permalink
Fix isolation base path
Browse files Browse the repository at this point in the history
  • Loading branch information
zkayyali812 committed Jan 12, 2024
1 parent 321f8c6 commit 08618a9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ podman_internal_cidr: 10.0.2.0/24
# 'awx_isolation_base_path' is used to set the job execution path
# This is the directory in which the service will create new temporary directories for job execution and isolation (such as credential files).
# Default: "/tmp"
awx_isolation_base_path: "{{ settings.AWX_ISOLATION_BASE_PATH }}"
awx_isolation_base_path: "{{ awx_isolation_base_path }}"

# 'receptor_image_registry' is used to define the registry used to pull the receptor image
# Default: "quay.io/ansible"
Expand Down
4 changes: 3 additions & 1 deletion awx/api/views/instance_install_bundle.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
from django.template.loader import render_to_string
from django.utils.translation import gettext_lazy as _
from rest_framework import status
from django.conf import settings


# Red Hat has an OID namespace (RHANANA). Receptor has its own designation under that.
RECEPTOR_OID = "1.3.6.1.4.1.2312.19.1"
Expand Down Expand Up @@ -128,7 +130,7 @@ def generate_group_vars_all_yml(instance_obj):
peers = []
for addr in instance_obj.peers.all().prefetch_related('instance'):
peers.append(dict(address=addr.get_full_address(), protocol=addr.instance.protocol))
context = dict(instance=instance_obj, peers=peers)
context = dict(instance=instance_obj, peers=peers, awx_isolation_base_path=settings.AWX_ISOLATION_BASE_PATH)

if instance_obj.listener_port:
context['listener_port'] = instance_obj.listener_port
Expand Down

0 comments on commit 08618a9

Please sign in to comment.