diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-06-08 09:08:17 -0400 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2016-06-08 09:08:17 -0400 |
| commit | 9553b9173d951de39b52a03688ea6f7aff7291d4 (patch) | |
| tree | efae1f93ecdbe172fe38aaf44b0414ce4da3ab1f /roles/docker/tasks/main.yml | |
| parent | 377405b67551ef51ce6f644bde018986465a1e0c (diff) | |
| parent | a2fad7dd125bb4f1b0123beab81cbff9075397d4 (diff) | |
| download | openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.gz openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.bz2 openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.tar.xz openshift-9553b9173d951de39b52a03688ea6f7aff7291d4.zip | |
Merge pull request #1964 from sdodson/fix-proxy-smashing
Preserve proxy config if it exists in the sysconfig files but is undefined in our config
Diffstat (limited to 'roles/docker/tasks/main.yml')
| -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: |