diff options
| author | Michael Gugino <mgugino@redhat.com> | 2017-10-31 14:39:06 -0400 |
|---|---|---|
| committer | Michael Gugino <mgugino@redhat.com> | 2017-10-31 14:39:06 -0400 |
| commit | abcc49d0ccdbdbaaeb69b5dccf68244f36c66246 (patch) | |
| tree | a8f9b683c44d32f0cc71ef3e8a0d94b70dcd2645 /roles/docker/tasks | |
| parent | 67f1b16a6357143ac07b83b859994a34e4569b86 (diff) | |
| download | openshift-abcc49d0ccdbdbaaeb69b5dccf68244f36c66246.tar.gz openshift-abcc49d0ccdbdbaaeb69b5dccf68244f36c66246.tar.bz2 openshift-abcc49d0ccdbdbaaeb69b5dccf68244f36c66246.tar.xz openshift-abcc49d0ccdbdbaaeb69b5dccf68244f36c66246.zip | |
Docker: make use of new etc/containers/registries.conf optional
Currently, not all versions of docker support using
/etc/containers/registries.conf
This commit makes the use of that file optional.
Diffstat (limited to 'roles/docker/tasks')
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index b16413f72..c1aedf879 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -81,6 +81,7 @@ template: dest: "{{ containers_registries_conf_path }}" src: registries.conf + when: openshift_docker_use_etc_containers | bool notify: - restart docker |