summaryrefslogtreecommitdiffstats
path: root/roles/docker
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-04-25 16:15:56 -0400
commit7cf2ef446cde3f54d4c7095aba20e594c5747630 (patch)
tree64e983078a369637ea18c3be10ac1115bfa4ca8c /roles/docker
parent407dd1d28f06a3b66c2eeaa05a81279c7704779d (diff)
parent3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff)
downloadopenshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.gz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.bz2
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.tar.xz
openshift-7cf2ef446cde3f54d4c7095aba20e594c5747630.zip
Merge branch 'master' into evac
Diffstat (limited to 'roles/docker')
-rw-r--r--roles/docker/tasks/main.yml15
1 files changed, 15 insertions, 0 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 4a47a60fa..0414ff21e 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -69,6 +69,21 @@
reg_flag: --insecure-registry
notify:
- restart docker
+
+- name: Set Proxy Settings
+ lineinfile:
+ dest: /etc/sysconfig/docker
+ regexp: '^{{ item.reg_conf_var }}=.*$'
+ line: "{{ item.reg_conf_var }}='{{ item.reg_fact_val }}'"
+ with_items:
+ - reg_conf_var: HTTP_PROXY
+ reg_fact_val: "{{ docker_http_proxy | default('') }}"
+ - reg_conf_var: HTTPS_PROXY
+ reg_fact_val: "{{ docker_https_proxy | default('') }}"
+ - reg_conf_var: NO_PROXY
+ reg_fact_val: "{{ docker_no_proxy | default('') | join(',') }}"
+ notify:
+ - restart docker
- name: Set various docker options
lineinfile: