diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-11-20 17:43:52 +0100 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2017-11-20 22:05:01 +0100 |
| commit | c16a06911a8c5dd321fd2fedf560e50494305f18 (patch) | |
| tree | 1a9ad0c9a47f2df33aab0f7b90f0119cececae76 /roles | |
| parent | f725e46bd897efe35cb8abba7862d1482c3011f4 (diff) | |
| download | openshift-c16a06911a8c5dd321fd2fedf560e50494305f18.tar.gz openshift-c16a06911a8c5dd321fd2fedf560e50494305f18.tar.bz2 openshift-c16a06911a8c5dd321fd2fedf560e50494305f18.tar.xz openshift-c16a06911a8c5dd321fd2fedf560e50494305f18.zip | |
cri-o: honor additional and insecure registries again
Regression introduced with:
https://github.com/openshift/openshift-ansible/commit/ee6adf9e9a520cc5873bf9f36924ae9aa4c47c7c
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 3fe10454d..e87f6fd02 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 }}" |