summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-05-12 10:57:04 -0400
committerSteve Milner <smilner@redhat.com>2017-05-15 09:38:56 -0400
commit1cc0b91ce8ac89021315daa044732171f57c88db (patch)
tree62aa83c7c6d0d44a6765480e90f0749202e0bef5 /roles
parentf20bf5310aa6d1b8ca6fb418485b3a90750f9ee9 (diff)
downloadopenshift-1cc0b91ce8ac89021315daa044732171f57c88db.tar.gz
openshift-1cc0b91ce8ac89021315daa044732171f57c88db.tar.bz2
openshift-1cc0b91ce8ac89021315daa044732171f57c88db.tar.xz
openshift-1cc0b91ce8ac89021315daa044732171f57c88db.zip
Add no_proxy to atomic.conf
Requires: https://github.com/projectatomic/atomic/pull/999
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml10
1 files changed, 9 insertions, 1 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index c85801546..44f56aede 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -41,7 +41,7 @@
daemon_reload: yes
ignore_errors: True
-# Set http_proxy and https_proxy in /etc/atomic.conf
+# Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf
- block:
- name: Add http_proxy to /etc/atomic.conf
@@ -60,6 +60,14 @@
- openshift.common.https_proxy is defined
- openshift.common.https_proxy != ''
+ - name: Add no_proxy to /etc/atomic.conf
+ lineinfile:
+ path: /etc/atomic.conf
+ line: "no_proxy={{ openshift.common.no_proxy | default('') }}"
+ when:
+ - openshift.common.no_proxy is defined
+ - openshift.common.no_proxy != ''
+
- block:
- name: Set to default prepend