Browse Source

crio: define and use l_is_node_system_container

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Giuseppe Scrivano 7 years ago
parent
commit
2ae1a09754

+ 3 - 0
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) }}"

+ 1 - 1
roles/container_runtime/tasks/systemcontainer_crio.yml

@@ -4,7 +4,7 @@
   fail: msg='Cannot use CRI-O with node configured as a Docker container'
   when:
     - openshift.common.is_containerized | bool
-    - not openshift.common.is_node_system_container | bool
+    - not l_is_node_system_container | bool
 
 - include_tasks: common/pre.yml