Bläddra i källkod

cri-o: Default insecure registries to ""

Steve Milner 7 år sedan
förälder
incheckning
c66d51f519
2 ändrade filer med 2 tillägg och 1 borttagningar
  1. 1 0
      roles/docker/tasks/systemcontainer_crio.yml
  2. 1 1
      roles/docker/templates/crio.conf.j2

+ 1 - 0
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:

+ 1 - 1
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