diff options
author | Steve Milner <smilner@redhat.com> | 2017-05-14 10:32:24 -0400 |
---|---|---|
committer | Steve Milner <smilner@redhat.com> | 2017-05-15 09:40:30 -0400 |
commit | d8916bea8822b6f828d90fd85b026a32070a5883 (patch) | |
tree | 73230ed29a4211f5e55899477a65db932675ef65 /roles/docker/tasks | |
parent | 1cc0b91ce8ac89021315daa044732171f57c88db (diff) | |
download | openshift-d8916bea8822b6f828d90fd85b026a32070a5883.tar.gz openshift-d8916bea8822b6f828d90fd85b026a32070a5883.tar.bz2 openshift-d8916bea8822b6f828d90fd85b026a32070a5883.tar.xz openshift-d8916bea8822b6f828d90fd85b026a32070a5883.zip |
Add NO_PROXY workaround for container-engine atomic command
Ref: https://bugzilla.redhat.com/show_bug.cgi?id=1450310
Diffstat (limited to 'roles/docker/tasks')
-rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index 44f56aede..e5576d515 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -96,9 +96,13 @@ set_fact: l_docker_image: "{{ l_docker_image_prepend }}/{{ openshift.docker.service_name }}:latest" +# NOTE: no_proxy added as a workaround until https://github.com/projectatomic/atomic/pull/999 is released - name: Pre-pull Container Enginer System Container image command: "atomic pull --storage ostree {{ l_docker_image }}" changed_when: false + environment: + NO_PROXY: "{{ openshift.common.no_proxy | default('') }}" + - name: Ensure container-engine.service.d directory exists file: |