From 55f6b3879d770d756963564a5894c09806a31003 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Sat, 15 Jul 2017 21:45:13 +0200
Subject: node.yaml: configure node to use cri-o when openshift.common.use_crio

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
 roles/openshift_node/templates/node.yaml.v1.j2 | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'roles/openshift_node/templates')

diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 351c8c9f6..a400dd8d9 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -16,6 +16,21 @@ imageConfig:
   latest: false
 kind: NodeConfig
 kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }}
+{% if use_crio | default(False) %}
+  container-runtime:
+  - remote
+  container-runtime-endpoint:
+  - /var/run/crio.sock
+  enable-cri:
+  - 'true'
+  image-service-endpoint:
+  - /var/run/crio.sock
+  node-labels:
+  - router=true
+  - registry=true
+  runtime-request-timeout:
+  - 10m
+{% endif %}
 {% if openshift.common.version_gte_3_3_or_1_3 | bool %}
 masterClientConnectionOverrides:
   acceptContentTypes: application/vnd.kubernetes.protobuf,application/json
-- 
cgit v1.2.3


From 85b9622751913619e57b9380b6051dc612e990b9 Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Mon, 17 Jul 2017 14:28:46 -0400
Subject: cri-o: Add cri-o as a Wants in node units

---
 roles/openshift_node/templates/node.service.j2                   | 1 +
 roles/openshift_node/templates/openshift.docker.node.dep.service | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'roles/openshift_node/templates')

diff --git a/roles/openshift_node/templates/node.service.j2 b/roles/openshift_node/templates/node.service.j2
index e12a52c15..3d0ae3bbd 100644
--- a/roles/openshift_node/templates/node.service.j2
+++ b/roles/openshift_node/templates/node.service.j2
@@ -8,6 +8,7 @@ Wants={{ openshift.docker.service_name }}.service
 Documentation=https://github.com/openshift/origin
 Requires=dnsmasq.service
 After=dnsmasq.service
+{% if openshift.docker.use_crio %}Wants=cri-o.service{% endif %}
 
 [Service]
 Type=notify
diff --git a/roles/openshift_node/templates/openshift.docker.node.dep.service b/roles/openshift_node/templates/openshift.docker.node.dep.service
index 4c47f8c0d..c4580be1f 100644
--- a/roles/openshift_node/templates/openshift.docker.node.dep.service
+++ b/roles/openshift_node/templates/openshift.docker.node.dep.service
@@ -3,7 +3,7 @@ Requires={{ openshift.docker.service_name }}.service
 After={{ openshift.docker.service_name }}.service
 PartOf={{ openshift.common.service_type }}-node.service
 Before={{ openshift.common.service_type }}-node.service
-
+{% if openshift.docker.use_crio %}Wants=cri-o.service{% endif %}
 
 [Service]
 ExecStart=/bin/bash -c "if [[ -f /usr/bin/docker-current ]]; then echo \"DOCKER_ADDTL_BIND_MOUNTS=--volume=/usr/bin/docker-current:/usr/bin/docker-current:ro --volume=/etc/sysconfig/docker:/etc/sysconfig/docker:ro\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; else echo \"#DOCKER_ADDTL_BIND_MOUNTS=\" > /etc/sysconfig/{{ openshift.common.service_type }}-node-dep; fi"
-- 
cgit v1.2.3


From 4588260e27e0e139690d0219f6e57b125dce116a Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Wed, 19 Jul 2017 10:36:24 -0400
Subject: cri-o: Fix node template to use full variable

---
 roles/openshift_node/templates/node.yaml.v1.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roles/openshift_node/templates')

diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index a400dd8d9..2a664790f 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -16,7 +16,7 @@ imageConfig:
   latest: false
 kind: NodeConfig
 kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yaml(level=1) }}
-{% if use_crio | default(False) %}
+{% if openshift.docker.use_crio | default(False) %}
   container-runtime:
   - remote
   container-runtime-endpoint:
-- 
cgit v1.2.3


From a4be4c390a5eca18ef2cec8af57c24dfc162e6d2 Mon Sep 17 00:00:00 2001
From: Steve Milner <smilner@redhat.com>
Date: Wed, 19 Jul 2017 16:40:04 -0400
Subject: openshift_node: fix typo for experimental-cri

---
 roles/openshift_node/templates/node.yaml.v1.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'roles/openshift_node/templates')

diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 2a664790f..93f8658b4 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -21,7 +21,7 @@ kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yam
   - remote
   container-runtime-endpoint:
   - /var/run/crio.sock
-  enable-cri:
+  experimental-cri:
   - 'true'
   image-service-endpoint:
   - /var/run/crio.sock
-- 
cgit v1.2.3