summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-07-19 09:55:59 -0400
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-08-03 17:20:52 +0200
commitc66d51f519acf2958a378c109750b86620e32122 (patch)
tree4b8facf3b1d453dfeb70a4c7bf3ddcf4ca0c072d
parent3003a54811227f5434a8a3d7c8d54c3accafd1e3 (diff)
downloadopenshift-c66d51f519acf2958a378c109750b86620e32122.tar.gz
openshift-c66d51f519acf2958a378c109750b86620e32122.tar.bz2
openshift-c66d51f519acf2958a378c109750b86620e32122.tar.xz
openshift-c66d51f519acf2958a378c109750b86620e32122.zip
cri-o: Default insecure registries to ""
-rw-r--r--roles/docker/tasks/systemcontainer_crio.yml1
-rw-r--r--roles/docker/templates/crio.conf.j22
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