summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-11-29 17:04:13 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-12-08 18:40:39 +0100
commit2ae1a0975472d47063575710223b2fa7431499c8 (patch)
tree1f02f1161712b6434e969a57a49d0af0a6fa10ae
parent0beab180d22f28f3f529ca0252f23bb92a7b69a7 (diff)
downloadopenshift-2ae1a0975472d47063575710223b2fa7431499c8.tar.gz
openshift-2ae1a0975472d47063575710223b2fa7431499c8.tar.bz2
openshift-2ae1a0975472d47063575710223b2fa7431499c8.tar.xz
openshift-2ae1a0975472d47063575710223b2fa7431499c8.zip
crio: define and use l_is_node_system_container
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/container_runtime/defaults/main.yml3
-rw-r--r--roles/container_runtime/tasks/systemcontainer_crio.yml2
2 files changed, 4 insertions, 1 deletions
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) }}"
diff --git a/roles/container_runtime/tasks/systemcontainer_crio.yml b/roles/container_runtime/tasks/systemcontainer_crio.yml
index 5ea7df650..61f122f3c 100644
--- a/roles/container_runtime/tasks/systemcontainer_crio.yml
+++ b/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