diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-04-25 15:31:18 -0400 |
| commit | 337b9e4a842cfd7ec6705fd1501cc9c2991a694f (patch) | |
| tree | 67bdb2c745ecc736de7b62df50095a5b3cc59176 /roles/docker | |
| parent | b90fb397908c4e5f9001724e7f8ddcc25f4ffdea (diff) | |
| parent | 3262718f8fc4658a3b223823244f1f78cb0eb6c8 (diff) | |
| download | openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.gz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.bz2 openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.tar.xz openshift-337b9e4a842cfd7ec6705fd1501cc9c2991a694f.zip | |
Merge branch 'master' into issue1800
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/main.yml | 15 |
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: |