summaryrefslogtreecommitdiffstats
path: root/roles/docker/tasks
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-01-26 09:17:31 -0500
committerGitHub <noreply@github.com>2017-01-26 09:17:31 -0500
commit824e3a669e4683c3baf94d8f9eee168bc68afcb1 (patch)
tree67f104050de377ed852795ac1dc4b856de582f52 /roles/docker/tasks
parent7f1f05d90b4f6032629cf1a08e8f4139093f0f0b (diff)
parentcd2690c5fd83719c5abba0220c58acc584210a7f (diff)
downloadopenshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.gz
openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.bz2
openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.tar.xz
openshift-824e3a669e4683c3baf94d8f9eee168bc68afcb1.zip
Merge pull request #3182 from abutcher/no-proxy-list
Comma separate no_proxy host list in openshift_facts
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r--roles/docker/tasks/main.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 66c9cfa0f..c34700aeb 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -85,7 +85,7 @@
- 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(',') }}"
+ reg_fact_val: "{{ docker_no_proxy | default('') }}"
notify:
- restart docker
when: