summaryrefslogtreecommitdiffstats
path: root/roles/openshift_docker_facts
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-04-25 15:31:18 -0400
committerScott Dodson <sdodson@redhat.com>2016-04-25 15:31:18 -0400
commit337b9e4a842cfd7ec6705fd1501cc9c2991a694f (patch)
tree67bdb2c745ecc736de7b62df50095a5b3cc59176 /roles/openshift_docker_facts
parentb90fb397908c4e5f9001724e7f8ddcc25f4ffdea (diff)
parent3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff)
downloadopenshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.gz
openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.bz2
openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.xz
openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.zip
Merge branch 'master' into issue1800
Diffstat (limited to 'roles/openshift_docker_facts')
-rw-r--r--roles/openshift_docker_facts/tasks/main.yml3
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: >