diff options
Diffstat (limited to 'roles')
-rw-r--r-- | roles/docker/tasks/systemcontainer_crio.yml | 1 | ||||
-rw-r--r-- | roles/docker/templates/crio.conf.j2 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roles/docker/tasks/systemcontainer_crio.yml b/roles/docker/tasks/systemcontainer_crio.yml index 7c3ed90d8..651a20ea2 100644 --- a/roles/docker/tasks/systemcontainer_crio.yml +++ b/roles/docker/tasks/systemcontainer_crio.yml @@ -2,6 +2,7 @@ # TODO: Much of this file is shared with container engine tasks - set_fact: l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(openshift.docker.insecure_registries)) }}" + when: openshift.docker.insecure_registries - name: Ensure container-selinux is installed package: diff --git a/roles/docker/templates/crio.conf.j2 b/roles/docker/templates/crio.conf.j2 index f7049aa41..eae1759ab 100644 --- a/roles/docker/templates/crio.conf.j2 +++ b/roles/docker/templates/crio.conf.j2 @@ -117,7 +117,7 @@ signature_policy = "" # insecure_registries is used to skip TLS verification when pulling images. insecure_registries = [ -{{ l_insecure_crio_registries }} +{{ l_insecure_crio_registries|default("") }} ] # The "crio.network" table contains settings pertaining to the |