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

Template docker receptor yaml file, update Makefile to reflect this change

Browse Source
This commit is contained in:
beeankha
2021-07-22 13:28:13 -04:00
committed by Alan Rominger
parent 2fc581c249
commit 264c560a8a
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -545,7 +545,7 @@ docker-compose-elk: docker-auth awx/projects docker-compose-sources
docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate
docker-compose-cluster: docker-auth awx/projects docker-compose-sources docker-compose-cluster: docker-auth awx/projects docker-compose-sources
docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-receptor.yml up docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/docker-compose/_sources/docker-receptor.yml up
docker-compose-cluster-elk: docker-auth awx/projects docker-compose-sources docker-compose-cluster-elk: docker-auth awx/projects docker-compose-sources
docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate docker-compose -f tools/docker-compose/_sources/docker-compose.yml -f tools/elastic/docker-compose.logstash-link-cluster.yml -f tools/elastic/docker-compose.elastic-override.yml up --no-recreate

6
tools/docker-compose/ansible/roles/sources/tasks/main.yml
View File

@@ -81,3 +81,9 @@
src: docker-compose.yml.j2 src: docker-compose.yml.j2
dest: "{{ sources_dest }}/{{ compose_name }}" dest: "{{ sources_dest }}/{{ compose_name }}"
mode: '0600' mode: '0600'
- name: Render Docker-Compose (Receptor)
template:
src: docker-receptor.yml.j2
dest: "{{ sources_dest }}/docker-receptor.yml"
mode: '0600'

8
tools/docker-receptor.yml → tools/docker-compose/ansible/roles/sources/templates/docker-receptor.yml.j2
View File

@@ -9,7 +9,7 @@
# ^-------------- <receptor-3> # ^-------------- <receptor-3>
# #
--- ---
version: '2' version: '2.1'
services: services:
awx_1: awx_1:
environment: environment:
@@ -30,7 +30,7 @@ services:
- "../../docker-compose-cluster:/etc/receptor" - "../../docker-compose-cluster:/etc/receptor"
receptor-1: receptor-1:
image: quay.io/awx/awx_devel:devel image: quay.io/awx/awx_devel:devel
user: "1000" user: "{{ ansible_user_uid }}"
container_name: tools_receptor_1 container_name: tools_receptor_1
hostname: receptor-1 hostname: receptor-1
command: 'receptor --config /etc/receptor/awx-1-receptor.conf' command: 'receptor --config /etc/receptor/awx-1-receptor.conf'
@@ -42,7 +42,7 @@ services:
privileged: true privileged: true
receptor-2: receptor-2:
image: quay.io/awx/awx_devel:devel image: quay.io/awx/awx_devel:devel
user: "1000" user: "{{ ansible_user_uid }}"
container_name: tools_receptor_2 container_name: tools_receptor_2
hostname: receptor-2 hostname: receptor-2
command: 'receptor --config /etc/receptor/awx-2-receptor.conf' command: 'receptor --config /etc/receptor/awx-2-receptor.conf'
@@ -54,7 +54,7 @@ services:
privileged: true privileged: true
receptor-3: receptor-3:
image: quay.io/awx/awx_devel:devel image: quay.io/awx/awx_devel:devel
user: "1000" user: "{{ ansible_user_uid }}"
container_name: tools_receptor_3 container_name: tools_receptor_3
hostname: receptor-3 hostname: receptor-3
command: 'receptor --config /etc/receptor/awx-3-receptor.conf' command: 'receptor --config /etc/receptor/awx-3-receptor.conf'