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/docker/tasks/main.yml | |
| 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/docker/tasks/main.yml')
| -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: |