External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5796 from rascasoft/devel

Browse Source 
Make possible to not start containers on compose

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-02-04 13:18:30 +00:00
committed by GitHub
parent 5435c6ec73 1e97bb71db
commit e59f3982ae
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
installer/roles/local_docker/defaults/main.yml
View File

@@ -18,3 +18,5 @@ memcached_image: "memcached"
memcached_version: "alpine" memcached_version: "alpine"
memcached_hostname: "memcached" memcached_hostname: "memcached"
memcached_port: "11211" memcached_port: "11211"
compose_start_containers: true

2
installer/roles/local_docker/tasks/compose.yml
View File

@@ -23,6 +23,7 @@
mode: 0600 mode: 0600
register: awx_secret_key register: awx_secret_key
- block:
- name: Start the containers - name: Start the containers
docker_compose: docker_compose:
project_src: "{{ docker_compose_dir }}" project_src: "{{ docker_compose_dir }}"
@@ -36,3 +37,4 @@
- name: Update CA trust in awx_task container - name: Update CA trust in awx_task container
command: docker exec awx_task '/usr/bin/update-ca-trust' command: docker exec awx_task '/usr/bin/update-ca-trust'
when: awx_compose_config.changed or awx_compose_start.changed when: awx_compose_config.changed or awx_compose_start.changed
when: compose_start_containers|bool

1
installer/roles/local_docker/tasks/main.yml
View File

@@ -47,6 +47,7 @@
file: file:
path: "{{ postgres_data_dir + '/pgdata' }}" path: "{{ postgres_data_dir + '/pgdata' }}"
state: absent state: absent
when: compose_start_containers|bool
- import_tasks: set_image.yml - import_tasks: set_image.yml
- import_tasks: compose.yml - import_tasks: compose.yml