diff --git a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 index 32ee5bf772..a8f53fe5c2 100644 --- a/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 +++ b/tools/ansible/roles/dockerfile/templates/Dockerfile.j2 @@ -210,7 +210,7 @@ RUN for dir in \ /var/log/nginx \ /var/lib/postgresql \ /var/run/supervisor \ - /var/run/receptor \ + /var/run/awx-receptor \ /var/lib/nginx ; \ do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \ for file in \ diff --git a/tools/docker-compose/ansible/roles/sources/defaults/main.yml b/tools/docker-compose/ansible/roles/sources/defaults/main.yml index 62d90ca4b9..2e8cd25c4a 100644 --- a/tools/docker-compose/ansible/roles/sources/defaults/main.yml +++ b/tools/docker-compose/ansible/roles/sources/defaults/main.yml @@ -7,3 +7,4 @@ pg_username: 'awx' pg_database: 'awx' control_plane_node_count: 1 minikube_container_group: false +receptor_socket_file: /var/run/awx-receptor/receptor.sock diff --git a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 index d4626a8e35..dbb4239f00 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2 @@ -18,7 +18,7 @@ services: SDB_PORT: {{ awx_sdb_port_start }} AWX_GROUP_QUEUES: tower MAIN_NODE_TYPE: "${MAIN_NODE_TYPE:-hybrid}" - RECEPTORCTL_SOCKET: /var/run/receptor/receptor.sock + RECEPTORCTL_SOCKET: {{ receptor_socket_file }} {% if loop.index == 1 %} RUN_MIGRATIONS: 1 {% endif %} @@ -114,6 +114,8 @@ services: container_name: tools_receptor_{{ loop.index }} hostname: receptor-{{ loop.index }} command: 'receptor --config /etc/receptor/receptor.conf' + environment: + RECEPTORCTL_SOCKET: {{ receptor_socket_file }} links: - receptor-hop volumes: diff --git a/tools/docker-compose/ansible/roles/sources/templates/receptor-awx.conf.j2 b/tools/docker-compose/ansible/roles/sources/templates/receptor-awx.conf.j2 index a274b5b2b7..c2d774d723 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/receptor-awx.conf.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/receptor-awx.conf.j2 @@ -22,7 +22,7 @@ - control-service: service: control - filename: /var/run/receptor/receptor.sock + filename: {{ receptor_socket_file }} - work-command: worktype: local diff --git a/tools/docker-compose/ansible/roles/sources/templates/receptor-worker.conf.j2 b/tools/docker-compose/ansible/roles/sources/templates/receptor-worker.conf.j2 index ef31f4d443..336f965982 100644 --- a/tools/docker-compose/ansible/roles/sources/templates/receptor-worker.conf.j2 +++ b/tools/docker-compose/ansible/roles/sources/templates/receptor-worker.conf.j2 @@ -16,3 +16,4 @@ - control-service: service: control + filename: {{ receptor_socket_file }}