summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-10-31 14:39:06 -0400
committerMichael Gugino <mgugino@redhat.com>2017-10-31 14:39:06 -0400
commitabcc49d0ccdbdbaaeb69b5dccf68244f36c66246 (patch)
treea8f9b683c44d32f0cc71ef3e8a0d94b70dcd2645
parent67f1b16a6357143ac07b83b859994a34e4569b86 (diff)
downloadopenshift-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.
-rw-r--r--roles/docker/defaults/main.yml1
-rw-r--r--roles/docker/tasks/package_docker.yml1
2 files changed, 2 insertions, 0 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index fe938e52b..f6f2bd77e 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -20,6 +20,7 @@ l2_docker_additional_registries: "{% if openshift_docker_additional_registries i
l2_docker_blocked_registries: "{% if openshift_docker_blocked_registries is string %}{% if openshift_docker_blocked_registries == '' %}[]{% elif ',' in openshift_docker_blocked_registries %}{{ openshift_docker_blocked_registries.split(',') | list }}{% else %}{{ [ openshift_docker_blocked_registries ] }}{% endif %}{% else %}{{ openshift_docker_blocked_registries }}{% endif %}"
l2_docker_insecure_registries: "{% if openshift_docker_insecure_registries is string %}{% if openshift_docker_insecure_registries == '' %}[]{% elif ',' in openshift_docker_insecure_registries %}{{ openshift_docker_insecure_registries.split(',') | list }}{% else %}{{ [ openshift_docker_insecure_registries ] }}{% endif %}{% else %}{{ openshift_docker_insecure_registries }}{% endif %}"
+openshift_docker_use_etc_containers: False
containers_registries_conf_path: /etc/containers/registries.conf
r_crio_firewall_enabled: "{{ os_firewall_enabled | default(True) }}"
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