diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-23 04:23:30 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 04:23:30 -0700 |
| commit | 75fc5ef69b792d9595918383286b0d9e45eda848 (patch) | |
| tree | ada09bad9eab0c27ee2c7b7829876acf6d3531d6 /roles/openshift_atomic/tasks | |
| parent | 1a0f460eb67f1a6fa82385faa91df4edd4b9d7d3 (diff) | |
| parent | c7b7ff56ab5365e74a5a6516b64a0a86a8218d12 (diff) | |
| download | openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.gz openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.bz2 openshift-75fc5ef69b792d9595918383286b0d9e45eda848.tar.xz openshift-75fc5ef69b792d9595918383286b0d9e45eda848.zip | |
Merge pull request #5813 from ashcrow/1503903
Automatic merge from submit-queue.
Always ensure atomic.conf is configured for system containers.
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
Diffstat (limited to 'roles/openshift_atomic/tasks')
| -rw-r--r-- | roles/openshift_atomic/tasks/proxy.yml | 32 |
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 != '' |