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

dev environment - change location of receptor socket and sync awx and receptor nodes function (#11005)

Browse Source 
* Change the location of the receptor socket

to /var/run/awx-receptor, to match what the installer is currently doing.

* Sync awx and receptor nodes for control socket

Co-authored-by: Jeff Bradberry <jeff.bradberry@gmail.com>
This commit is contained in:
Alan Rominger
2021-09-02 09:18:25 -04:00
committed by GitHub
parent 77e704cef1
commit eb0528c157
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ansible/roles/dockerfile/templates/Dockerfile.j2
View File

@@ -210,7 +210,7 @@ RUN for dir in \
/var/log/nginx \ /var/log/nginx \
/var/lib/postgresql \ /var/lib/postgresql \
/var/run/supervisor \ /var/run/supervisor \
/var/run/receptor \ /var/run/awx-receptor \
/var/lib/nginx ; \ /var/lib/nginx ; \
do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \ do mkdir -m 0775 -p $dir ; chmod g+rw $dir ; chgrp root $dir ; done && \
for file in \ for file in \

1
tools/docker-compose/ansible/roles/sources/defaults/main.yml
View File

@@ -7,3 +7,4 @@ pg_username: 'awx'
pg_database: 'awx' pg_database: 'awx'
control_plane_node_count: 1 control_plane_node_count: 1
minikube_container_group: false minikube_container_group: false
receptor_socket_file: /var/run/awx-receptor/receptor.sock

4
tools/docker-compose/ansible/roles/sources/templates/docker-compose.yml.j2
View File

@@ -18,7 +18,7 @@ services:
SDB_PORT: {{ awx_sdb_port_start }} SDB_PORT: {{ awx_sdb_port_start }}
AWX_GROUP_QUEUES: tower AWX_GROUP_QUEUES: tower
MAIN_NODE_TYPE: "${MAIN_NODE_TYPE:-hybrid}" MAIN_NODE_TYPE: "${MAIN_NODE_TYPE:-hybrid}"
RECEPTORCTL_SOCKET: /var/run/receptor/receptor.sock RECEPTORCTL_SOCKET: {{ receptor_socket_file }}
{% if loop.index == 1 %} {% if loop.index == 1 %}
RUN_MIGRATIONS: 1 RUN_MIGRATIONS: 1
{% endif %} {% endif %}
@@ -114,6 +114,8 @@ services:
container_name: tools_receptor_{{ loop.index }} container_name: tools_receptor_{{ loop.index }}
hostname: receptor-{{ loop.index }} hostname: receptor-{{ loop.index }}
command: 'receptor --config /etc/receptor/receptor.conf' command: 'receptor --config /etc/receptor/receptor.conf'
environment:
RECEPTORCTL_SOCKET: {{ receptor_socket_file }}
links: links:
- receptor-hop - receptor-hop
volumes: volumes:

2
tools/docker-compose/ansible/roles/sources/templates/receptor-awx.conf.j2
View File

@@ -22,7 +22,7 @@
- control-service: - control-service:
service: control service: control
filename: /var/run/receptor/receptor.sock filename: {{ receptor_socket_file }}
- work-command: - work-command:
worktype: local worktype: local

1
tools/docker-compose/ansible/roles/sources/templates/receptor-worker.conf.j2
View File

@@ -16,3 +16,4 @@
- control-service: - control-service:
service: control service: control
filename: {{ receptor_socket_file }}