From abcc49d0ccdbdbaaeb69b5dccf68244f36c66246 Mon Sep 17 00:00:00 2001
From: Michael Gugino <mgugino@redhat.com>
Date: Tue, 31 Oct 2017 14:39:06 -0400
Subject: 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.
---
 roles/docker/tasks/package_docker.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'roles/docker/tasks/package_docker.yml')

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
 
-- 
cgit v1.2.3