From a294a6f06e85c630074ea337b2b9f6c4098a00fb Mon Sep 17 00:00:00 2001 From: Dennis U Date: Thu, 9 Aug 2018 14:07:29 +0200 Subject: [PATCH] Bugfix for ca_trust_dir Changed syntax as ca_trust_dir was not correctly mounted in awx_web container and added command to update CA trust inside awx_web container after creation. --- installer/roles/local_docker/tasks/standalone.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/installer/roles/local_docker/tasks/standalone.yml b/installer/roles/local_docker/tasks/standalone.yml index b2a4d6d645..aa902c6a56 100644 --- a/installer/roles/local_docker/tasks/standalone.yml +++ b/installer/roles/local_docker/tasks/standalone.yml @@ -80,11 +80,9 @@ state: started restart_policy: unless-stopped image: "{{ awx_web_docker_actual_image }}" - volumes: > - {{ - [project_data_dir + ':/var/lib/awx/projects:rw'] if project_data_dir is defined else [] - + [ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro'] if ca_trust_dir is defined else [] - }} + volumes: + - "{{ project_data_dir + ':/var/lib/awx/projects:rw' if project_data_dir is defined else [] }}" + - "{{ ca_trust_dir + ':/etc/pki/ca-trust/source/anchors:ro' if ca_trust_dir is defined else [] }}" user: root ports: - "{{ host_port }}:8052" @@ -111,6 +109,11 @@ MEMCACHED_PORT: "11211" AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}" AWX_ADMIN_PASSWORD: "{{ default_admin_password|default('password') }}" + register: awx_web_container + +- name: Update CA trust in awx_web container + command: docker exec awx_web '/usr/bin/update-ca-trust' + when: awx_web_container.changed - name: Activate AWX Task Container docker_container: