diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-05-31 14:05:35 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-06-07 16:58:48 -0400 |
| commit | a2fad7dd125bb4f1b0123beab81cbff9075397d4 (patch) | |
| tree | 5dea17bbf5b832af12504818595dc7f13402ee16 /roles/docker/tasks | |
| parent | 98fa177034fd31b638afba5f826e83cb44e830a9 (diff) | |
| download | openshift-a2fad7dd125bb4f1b0123beab81cbff9075397d4.tar.gz openshift-a2fad7dd125bb4f1b0123beab81cbff9075397d4.tar.bz2 openshift-a2fad7dd125bb4f1b0123beab81cbff9075397d4.tar.xz openshift-a2fad7dd125bb4f1b0123beab81cbff9075397d4.zip | |
Preserve proxy config if it's undefined
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/main.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index b9b2666fb..5f94500a0 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -85,6 +85,7 @@ reg_fact_val: "{{ docker_no_proxy | default('') | join(',') }}" notify: - restart docker + when: "{{ 'http_proxy' in openshift.common or 'https_proxy' in openshift.common and docker_check.stat.isreg }}" - name: Set various docker options lineinfile: |