diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-12-07 12:19:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-07 12:19:40 -0500 |
| commit | 33b127157d3339caa690e6b238a81f7fe83f1383 (patch) | |
| tree | e307026abdee8e76c1b7df0edbc62a0e43049731 /roles/openshift_atomic/tasks | |
| parent | 54175f4b668cc1e6108b7d0af13275fcda9f586f (diff) | |
| parent | 2249ba3d08d1e6c55bf008609c9e4eace16bd917 (diff) | |
| download | openshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.gz openshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.bz2 openshift-33b127157d3339caa690e6b238a81f7fe83f1383.tar.xz openshift-33b127157d3339caa690e6b238a81f7fe83f1383.zip | |
Merge pull request #6362 from mgugino-upstream-stage/crt-plays
Implement container_runtime playbooks and changes
Diffstat (limited to 'roles/openshift_atomic/tasks')
| -rw-r--r-- | roles/openshift_atomic/tasks/proxy.yml | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/roles/openshift_atomic/tasks/proxy.yml b/roles/openshift_atomic/tasks/proxy.yml deleted file mode 100644 index dde099984..000000000 --- a/roles/openshift_atomic/tasks/proxy.yml +++ /dev/null @@ -1,32 +0,0 @@ ---- -# 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 != '' |