diff options
| author | Steve Milner <smilner@redhat.com> | 2017-05-12 11:21:52 -0400 |
|---|---|---|
| committer | Steve Milner <smilner@redhat.com> | 2017-05-12 11:21:52 -0400 |
| commit | 5bc2f017b1ad5b2e56842347e3338df862f9f927 (patch) | |
| tree | 0dd66c11d988a399bf9cf679a15f67123eb25fc4 | |
| parent | 10ebc8c3ca7b37ddd185628c2f2632b39d6864f5 (diff) | |
| download | openshift-5bc2f017b1ad5b2e56842347e3338df862f9f927.tar.gz openshift-5bc2f017b1ad5b2e56842347e3338df862f9f927.tar.bz2 openshift-5bc2f017b1ad5b2e56842347e3338df862f9f927.tar.xz openshift-5bc2f017b1ad5b2e56842347e3338df862f9f927.zip | |
Always add proxy items to atomic.conf
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 7f2ce14d1..4cea266cc 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -27,7 +27,7 @@ state: present when: not openshift.common.is_atomic | bool -# If we are on atomic, set http_proxy and https_proxy in /etc/atomic.conf +# Set http_proxy and https_proxy in /etc/atomic.conf - block: - name: Add http_proxy to /etc/atomic.conf @@ -46,9 +46,6 @@ - openshift.common.https_proxy is defined - openshift.common.https_proxy != '' - when: openshift.common.is_atomic | bool - - - block: - name: Set to default prepend |