diff options
| author | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
|---|---|---|
| committer | Devan Goodwin <dgoodwin@redhat.com> | 2016-06-09 11:50:51 -0300 |
| commit | 00eb0c79ed65543b3d358ae71b1a40fcbc88d78b (patch) | |
| tree | b791494908cd7341c420cc9c59dc6a2dd82db4a8 /roles/docker/tasks | |
| parent | 096cf64128ebcb1249044a1cb28b1b06154766ae (diff) | |
| parent | 078e5dca2d945fc789bce1f90432a19b6a8db75f (diff) | |
| download | openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.gz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.bz2 openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.tar.xz openshift-00eb0c79ed65543b3d358ae71b1a40fcbc88d78b.zip | |
Merge remote-tracking branch 'upstream/master' into upgrade33
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: |