diff options
| author | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 12:59:20 -0400 |
|---|---|---|
| committer | Jason DeTiberus <detiber@gmail.com> | 2016-04-25 12:59:20 -0400 |
| commit | 12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95 (patch) | |
| tree | e3a5a4313adebf617c43be22e61897bc9a19ce41 /roles/openshift_docker_facts | |
| parent | fb0c88c4246207f8b6132082c8bf67145df9ea01 (diff) | |
| parent | b90d2e6e80a7080d1753caba1251505383b998f9 (diff) | |
| download | openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.gz openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.bz2 openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.tar.xz openshift-12c2d75d84f76ddd806bffa4e3e4acc0c2f24f95.zip | |
Merge pull request #1385 from sdodson/global-proxy
Global Proxy Config
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: > |