summaryrefslogtreecommitdiffstats
path: root/roles/openshift_atomic/tasks
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-10-19 11:29:19 -0400
committerSteve Milner <smilner@redhat.com>2017-10-19 11:29:19 -0400
commitc7b7ff56ab5365e74a5a6516b64a0a86a8218d12 (patch)
tree2a3bb0b35dc78eec992570278bbfae3daf2edbc4 /roles/openshift_atomic/tasks
parent61cca52ea383d75aa4c20cf0e96936a5188084e9 (diff)
downloadopenshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.gz
openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.bz2
openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.tar.xz
openshift-c7b7ff56ab5365e74a5a6516b64a0a86a8218d12.zip
systemcontainers: Verify atomic.conf proxy is always configured
A new openshift_atomic role has been created for atomic specific tasks. The first task added is proxy which handles updating /etc/atomic.conf to ensure the proper proxy configuration is configured. This task file is then included (via include_role) in system container related task files. Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1503903 Signed-off-by: Steve Milner <smilner@redhat.com>
Diffstat (limited to 'roles/openshift_atomic/tasks')
-rw-r--r--roles/openshift_atomic/tasks/proxy.yml32
1 files changed, 32 insertions, 0 deletions
diff --git a/roles/openshift_atomic/tasks/proxy.yml b/roles/openshift_atomic/tasks/proxy.yml
new file mode 100644
index 000000000..dde099984
--- /dev/null
+++ b/roles/openshift_atomic/tasks/proxy.yml
@@ -0,0 +1,32 @@
+---
+# Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf
+# regexp: the line starts with or without #, followed by the string
+# http_proxy, then either : or =
+- block:
+
+ - name: Add http_proxy to /etc/atomic.conf
+ lineinfile:
+ dest: /etc/atomic.conf
+ regexp: "^#?http_proxy[:=]{1}"
+ line: "http_proxy: {{ openshift.common.http_proxy | default('') }}"
+ when:
+ - openshift.common.http_proxy is defined
+ - openshift.common.http_proxy != ''
+
+ - name: Add https_proxy to /etc/atomic.conf
+ lineinfile:
+ dest: /etc/atomic.conf
+ regexp: "^#?https_proxy[:=]{1}"
+ line: "https_proxy: {{ openshift.common.https_proxy | default('') }}"
+ when:
+ - openshift.common.https_proxy is defined
+ - openshift.common.https_proxy != ''
+
+ - name: Add no_proxy to /etc/atomic.conf
+ lineinfile:
+ dest: /etc/atomic.conf
+ regexp: "^#?no_proxy[:=]{1}"
+ line: "no_proxy: {{ openshift.common.no_proxy | default('') }}"
+ when:
+ - openshift.common.no_proxy is defined
+ - openshift.common.no_proxy != ''