From d506fb5103a770d6ba26556416c1874029efbb95 Mon Sep 17 00:00:00 2001 From: Jeff Bradberry Date: Thu, 6 Aug 2020 13:48:46 -0400 Subject: [PATCH] Run a receptor node in the dev environment --- installer/roles/image_build/templates/Dockerfile.j2 | 6 ++++++ tools/docker-compose-cluster.yml | 3 +++ tools/docker-compose.yml | 1 + tools/docker-compose/supervisor.conf | 8 ++++++++ 4 files changed, 18 insertions(+) diff --git a/installer/roles/image_build/templates/Dockerfile.j2 b/installer/roles/image_build/templates/Dockerfile.j2 index c16b4b4a2c99..9668a48f78e8 100644 --- a/installer/roles/image_build/templates/Dockerfile.j2 +++ b/installer/roles/image_build/templates/Dockerfile.j2 @@ -153,6 +153,11 @@ RUN python3 -m ensurepip && pip3 install "virtualenv < 20" supervisor {% if buil RUN rm -rf /root/.cache && rm -rf /tmp/* +# Install Receptor +RUN cd /usr/local/bin && \ + curl -L http://nightlies.testing.ansible.com/receptor/receptor --output receptor && \ + chmod a+x receptor + # Install OpenShift CLI RUN cd /usr/local/bin && \ curl -L https://github.com/openshift/origin/releases/download/v3.11.0/openshift-origin-client-tools-v3.11.0-0cbc58b-linux-64bit.tar.gz | \ @@ -203,6 +208,7 @@ RUN for dir in \ /var/log/tower \ /var/log/nginx \ /var/run/supervisor \ + /var/run/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-cluster.yml b/tools/docker-compose-cluster.yml index 7aec34d8e430..83e1d89852ce 100644 --- a/tools/docker-compose-cluster.yml +++ b/tools/docker-compose-cluster.yml @@ -32,6 +32,7 @@ services: - "./redis/redis_socket_ha_1:/var/run/redis/" - "./docker-compose/supervisor.conf:/etc/supervisord.conf" ports: + - "2222:2222" - "5899-5999:5899-5999" awx-2: user: ${CURRENT_UID} @@ -51,6 +52,7 @@ services: - "./redis/redis_socket_ha_2:/var/run/redis/" - "./docker-compose/supervisor.conf:/etc/supervisord.conf" ports: + - "2223:2222" - "7899-7999:7899-7999" awx-3: user: ${CURRENT_UID} @@ -70,6 +72,7 @@ services: - "./redis/redis_socket_ha_3:/var/run/redis/" - "./docker-compose/supervisor.conf:/etc/supervisord.conf" ports: + - "2224:2222" - "8899-8999:8899-8999" redis_1: user: ${CURRENT_UID} diff --git a/tools/docker-compose.yml b/tools/docker-compose.yml index 19ead5066194..3fd7435e86ce 100644 --- a/tools/docker-compose.yml +++ b/tools/docker-compose.yml @@ -15,6 +15,7 @@ services: SDB_PORT: 7899 AWX_GROUP_QUEUES: tower ports: + - "2222:2222" - "8888:8888" - "8080:8080" - "8013:8013" diff --git a/tools/docker-compose/supervisor.conf b/tools/docker-compose/supervisor.conf index 82e8962a9bc5..04ddb668387e 100644 --- a/tools/docker-compose/supervisor.conf +++ b/tools/docker-compose/supervisor.conf @@ -83,6 +83,14 @@ redirect_stderr=true stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 +[program:awx-receptor] +command = receptor --node id=%(ENV_HOSTNAME)s --control-service filename=/var/run/receptor/receptor.sock --tcp-listener port=2222 +autostart = true +autorestart = true +stopsignal = KILL +stopasgroup = true +killasgroup = true + [group:tower-processes] programs=awx-dispatcher,awx-receiver,awx-uwsgi,awx-daphne,awx-nginx,awx-wsbroadcast,awx-rsyslogd priority=5