summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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