From 5a95f2c793d37ea3bff87e9fb9ca0f2b385ebec8 Mon Sep 17 00:00:00 2001 From: "Steininger Robert, IR" Date: Tue, 26 Sep 2017 16:40:04 +0200 Subject: [PATCH 1/2] added proxy settings to docker runtimes --- installer/local_docker/tasks/main.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml index c422b97b58..688034a832 100644 --- a/installer/local_docker/tasks/main.yml +++ b/installer/local_docker/tasks/main.yml @@ -180,6 +180,9 @@ links: "{{ awx_web_container_links|list }}" hostname: awxweb env: + http_proxy: "{{ http_proxy | default('') }}" + https_proxy: "{{ https_proxy | default('') }}" + no_proxy: "{{ no_proxy | default('') }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}" @@ -206,6 +209,9 @@ user: root hostname: awx env: + http_proxy: "{{ http_proxy | default('') }}" + https_proxy: "{{ https_proxy | default('') }}" + no_proxy: "{{ no_proxy | default('') }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}" @@ -221,4 +227,3 @@ MEMCACHED_PORT: "11211" AWX_ADMIN_USER: "{{ default_admin_user|default('admin') }}" AWX_ADMIN_PASSWORD: "{{ default_admin_password|default('password') }}" - From 46287f69239e7f25c77e9fd14bfb3676f4c9f961 Mon Sep 17 00:00:00 2001 From: "Steininger Robert, IR" Date: Thu, 28 Sep 2017 10:11:29 +0200 Subject: [PATCH 2/2] proxy settings default omit --- installer/local_docker/tasks/main.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/local_docker/tasks/main.yml b/installer/local_docker/tasks/main.yml index 688034a832..53c87fe5d0 100644 --- a/installer/local_docker/tasks/main.yml +++ b/installer/local_docker/tasks/main.yml @@ -180,9 +180,9 @@ links: "{{ awx_web_container_links|list }}" hostname: awxweb env: - http_proxy: "{{ http_proxy | default('') }}" - https_proxy: "{{ https_proxy | default('') }}" - no_proxy: "{{ no_proxy | default('') }}" + http_proxy: "{{ http_proxy | default(omit) }}" + https_proxy: "{{ https_proxy | default(omit) }}" + no_proxy: "{{ no_proxy | default(omit) }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}" @@ -209,9 +209,9 @@ user: root hostname: awx env: - http_proxy: "{{ http_proxy | default('') }}" - https_proxy: "{{ https_proxy | default('') }}" - no_proxy: "{{ no_proxy | default('') }}" + http_proxy: "{{ http_proxy | default(omit) }}" + https_proxy: "{{ https_proxy | default(omit) }}" + no_proxy: "{{ no_proxy | default(omit) }}" SECRET_KEY: "{{ awx_secret_key }}" DATABASE_NAME: "{{ pg_database }}" DATABASE_USER: "{{ pg_username }}"