summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorMichael Gugino <gugino.michael@yahoo.com>2017-11-27 11:51:05 -0500
committerGitHub <noreply@github.com>2017-11-27 11:51:05 -0500
commit747224e87c16b0b4329f71c9e6ae74e4f0bb6178 (patch)
treedc07abc293f84a3609098163087a6df98df3ab7d /roles
parent174ada425abba669c7fd75368486576c8c376b46 (diff)
parentc16a06911a8c5dd321fd2fedf560e50494305f18 (diff)
downloadopenshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.gz
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.bz2
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.tar.xz
openshift-747224e87c16b0b4329f71c9e6ae74e4f0bb6178.zip
Merge pull request #6185 from giuseppe/fix-additional-and-insecure-registries-for-crio
cri-o: honor additional and insecure registries again
Diffstat (limited to 'roles')
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml6
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml
index 3e5bdf32c..17800d4e5 100644
--- a/roles/docker/tasks/systemcontainer_crio.yml
+++ b/roles/docker/tasks/systemcontainer_crio.yml
@@ -3,16 +3,10 @@
# TODO: Much of this file is shared with container engine tasks
- set_fact:
l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}"
- when: l2_docker_insecure_registries | bool
- set_fact:
l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
- when: l2_docker_additional_registries | bool
-- set_fact:
- l_crio_registries: "{{ ['docker.io'] }}"
- when: not (l2_docker_additional_registries | bool)
- set_fact:
l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"
- when: l2_docker_additional_registries | bool
- set_fact:
l_openshift_image_tag: "{{ openshift_image_tag | string }}"