diff options
| author | Andrew Butcher <abutcher@afrolegs.com> | 2016-04-26 16:22:42 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@afrolegs.com> | 2016-04-26 16:22:42 -0400 |
| commit | f1fb7eb8014334970a9b985daa34b6c483a42dde (patch) | |
| tree | 4ca4ce5392031bfb92baa8ef9ea10fabe8352916 /roles/docker | |
| parent | c934467629cdf1369c8e2a080a81dc54f154276a (diff) | |
| parent | 8bbe47fb6dfaead1eb63d94dc780e1e4c37a71d2 (diff) | |
| download | openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.gz openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.bz2 openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.tar.xz openshift-f1fb7eb8014334970a9b985daa34b6c483a42dde.zip | |
Merge pull request #1808 from sdodson/fix-proxy
Don't set empty HTTP_PROXY, HTTPS_PROXY, NO_PROXY values
Diffstat (limited to 'roles/docker')
| -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 0414ff21e..e4a31c692 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -75,6 +75,7 @@ dest: /etc/sysconfig/docker regexp: '^{{ item.reg_conf_var }}=.*$' line: "{{ item.reg_conf_var }}='{{ item.reg_fact_val }}'" + state: "{{ 'present' if item.reg_fact_val != '' else 'absent'}}" with_items: - reg_conf_var: HTTP_PROXY reg_fact_val: "{{ docker_http_proxy | default('') }}" |