Begin integrating receptor

This commit is contained in:
Shane McDonald
2020-11-12 16:34:18 -05:00
committed by Shane McDonald
parent 521d3d5edb
commit f1df4c54f8
7 changed files with 99 additions and 58 deletions

View File

@@ -143,11 +143,6 @@ RUN ansible-galaxy collection install --collections-path /usr/share/ansible/coll
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 | \
@@ -190,6 +185,7 @@ COPY --from=builder /var/lib/awx /var/lib/awx
RUN ln -s /var/lib/awx/venv/awx/bin/awx-manage /usr/bin/awx-manage
{%if build_dev|bool %}
COPY --from=quay.io/shanemcd/receptor /usr/bin/receptor /usr/bin/receptor
RUN openssl req -nodes -newkey rsa:2048 -keyout /etc/nginx/nginx.key -out /etc/nginx/nginx.csr \
-subj "/C=US/ST=North Carolina/L=Durham/O=Ansible/OU=AWX Development/CN=awx.localhost" && \
openssl x509 -req -days 365 -in /etc/nginx/nginx.csr -signkey /etc/nginx/nginx.key -out /etc/nginx/nginx.crt && \

View File

@@ -35,6 +35,8 @@ services:
- "redis_socket:/var/run/redis/:rw"
- "receptor:/var/run/receptor/"
- "/sys/fs/cgroup:/sys/fs/cgroup"
- "./docker-compose/receptor.conf:/etc/receptor/receptor.conf"
- "~/.kube/config:/var/lib/awx/.kube/config"
privileged: true
tty: true
# A useful container that simply passes through log messages to the console
@@ -43,16 +45,6 @@ services:
# build:
# context: ./docker-compose
# dockerfile: Dockerfile-logstash
ee:
image: quay.io/ansible/awx-ee
user: ${CURRENT_UID}
volumes:
- "./docker-compose/receptor.cfg:/receptor.cfg"
- "receptor:/var/run/receptor/"
command:
- receptor
- --config
- /receptor.cfg
postgres:
image: postgres:12
container_name: tools_postgres_1

View File

@@ -5,11 +5,15 @@
service: control
filename: /var/run/receptor/receptor.sock
- tcp-listener:
port: 2222
- local-only:
- work-command:
worktype: worker
command: ansible-runner
params: worker
allowruntimeparams: true
- work-kubernetes:
worktype: ocp
namespace: receptor
image: quay.io/shanemcd/ee
authmethod: kubeconfig

View File

@@ -84,7 +84,7 @@ 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
command = receptor --config /etc/receptor/receptor.conf
autostart = true
autorestart = true
stopsignal = KILL