From 2ae1a0975472d47063575710223b2fa7431499c8 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 29 Nov 2017 17:04:13 +0100 Subject: crio: define and use l_is_node_system_container Signed-off-by: Giuseppe Scrivano --- roles/container_runtime/defaults/main.yml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'roles/container_runtime/defaults') diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index bd96965ac..c5a21ba46 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -81,6 +81,7 @@ l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}" l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}" + openshift_crio_image_tag_default: "latest" l_crt_crio_image_tag_dict: @@ -127,3 +128,5 @@ l_docker_image_tag: "{{ l_crt_docker_image_tag_dict[openshift_deployment_type] } l_docker_image_default: "{{ l_docker_image_prepend }}/{{ openshift_docker_service_name }}:{{ l_docker_image_tag }}" l_docker_image: "{{ openshift_docker_systemcontainer_image_override | default(l_docker_image_default) }}" + +l_is_node_system_container: "{{ (openshift_use_node_system_container | default(openshift_use_system_containers | default(false)) | bool) }}" -- cgit v1.2.3 From 9c29b47f788b588d6f126a73e4eb03839cfb848f Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Wed, 6 Dec 2017 13:52:42 +0100 Subject: container-engine: log-opts is a dictionary in the daemon.json file Signed-off-by: Giuseppe Scrivano --- roles/container_runtime/defaults/main.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'roles/container_runtime/defaults') diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index c5a21ba46..d7eb8663f 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -59,6 +59,7 @@ docker_default_storage_path: /var/lib/docker # Set local versions of facts that must be in json format for container-daemon.json # NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson l_docker_log_options: "{{ l2_docker_log_options | to_json }}" +l_docker_log_options_dict: "{{ l2_docker_log_options | oo_list_to_dict | to_json }}" l_docker_additional_registries: "{{ l2_docker_additional_registries | to_json }}" l_docker_blocked_registries: "{{ l2_docker_blocked_registries | to_json }}" l_docker_insecure_registries: "{{ l2_docker_insecure_registries | to_json }}" -- cgit v1.2.3