diff --git a/installer/roles/local_docker/defaults/main.yml b/installer/roles/local_docker/defaults/main.yml index 9f308ea734..22f74d47ee 100644 --- a/installer/roles/local_docker/defaults/main.yml +++ b/installer/roles/local_docker/defaults/main.yml @@ -18,3 +18,5 @@ memcached_image: "memcached" memcached_version: "alpine" memcached_hostname: "memcached" memcached_port: "11211" + +compose_start_containers: true diff --git a/installer/roles/local_docker/tasks/compose.yml b/installer/roles/local_docker/tasks/compose.yml index f6dab2589e..949e30c8d6 100644 --- a/installer/roles/local_docker/tasks/compose.yml +++ b/installer/roles/local_docker/tasks/compose.yml @@ -23,16 +23,18 @@ mode: 0600 register: awx_secret_key -- name: Start the containers - docker_compose: - project_src: "{{ docker_compose_dir }}" - restarted: "{{ awx_compose_config is changed or awx_secret_key is changed }}" - register: awx_compose_start +- block: + - name: Start the containers + docker_compose: + project_src: "{{ docker_compose_dir }}" + restarted: "{{ awx_compose_config is changed or awx_secret_key is changed }}" + register: awx_compose_start -- name: Update CA trust in awx_web container - command: docker exec awx_web '/usr/bin/update-ca-trust' - when: awx_compose_config.changed or awx_compose_start.changed + - name: Update CA trust in awx_web container + command: docker exec awx_web '/usr/bin/update-ca-trust' + when: awx_compose_config.changed or awx_compose_start.changed -- name: Update CA trust in awx_task container - command: docker exec awx_task '/usr/bin/update-ca-trust' - when: awx_compose_config.changed or awx_compose_start.changed + - name: Update CA trust in awx_task container + command: docker exec awx_task '/usr/bin/update-ca-trust' + when: awx_compose_config.changed or awx_compose_start.changed + when: compose_start_containers|bool diff --git a/installer/roles/local_docker/tasks/main.yml b/installer/roles/local_docker/tasks/main.yml index e90ee30ca7..446f110f83 100644 --- a/installer/roles/local_docker/tasks/main.yml +++ b/installer/roles/local_docker/tasks/main.yml @@ -47,6 +47,7 @@ file: path: "{{ postgres_data_dir + '/pgdata' }}" state: absent + when: compose_start_containers|bool - import_tasks: set_image.yml - import_tasks: compose.yml