diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-04-25 16:15:56 -0400 |
| commit | 7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch) | |
| tree | 64e983078a369637ea18c3be10ac1115bfa4ca8c /roles/openshift_docker_facts | |
| parent | 407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2 openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip | |
Merge branch 'master' into evac
Diffstat (limited to 'roles/openshift_docker_facts')
| -rw-r--r-- | roles/openshift_docker_facts/tasks/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_docker_facts/tasks/main.yml b/roles/openshift_docker_facts/tasks/main.yml index 89393168b..3acd2bba8 100644 --- a/roles/openshift_docker_facts/tasks/main.yml +++ b/roles/openshift_docker_facts/tasks/main.yml @@ -27,6 +27,9 @@ docker_log_options: "{{ openshift.docker.log_options | default(omit) }}" docker_push_dockerhub: "{{ openshift.docker.disable_push_dockerhub | default(omit) }}" + docker_http_proxy: "{{ openshift.common.http_proxy | default(omit) }}" + docker_https_proxy: "{{ openshift.common.https_proxy | default(omit) }}" + docker_no_proxy: "{{ openshift.common.no_proxy | default(omit) }}" - set_fact: docker_options: > |