summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGiuseppe Scrivano <gscrivan@redhat.com>2017-12-12 20:05:55 +0100
committerGiuseppe Scrivano <gscrivan@redhat.com>2017-12-12 20:06:30 +0100
commit646dac7564181c8ca8be9f16dcb5887cfbb7d8fb (patch)
treea9c2cc1583336da2a1cf8683960ff68e591bf4dd
parent83af99aa87a83acfe69fbc8e27942121f34f3ece (diff)
downloadopenshift-646dac7564181c8ca8be9f16dcb5887cfbb7d8fb.tar.gz
openshift-646dac7564181c8ca8be9f16dcb5887cfbb7d8fb.tar.bz2
openshift-646dac7564181c8ca8be9f16dcb5887cfbb7d8fb.tar.xz
openshift-646dac7564181c8ca8be9f16dcb5887cfbb7d8fb.zip
crio: change socket path to /var/run/crio/crio.sock
it is required for OpenShift 3.9 Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
-rw-r--r--roles/container_runtime/templates/crio.conf.j22
-rw-r--r--roles/openshift_node/templates/node.yaml.v1.j24
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/container_runtime/templates/crio.conf.j2 b/roles/container_runtime/templates/crio.conf.j2
index 3f066a17f..0a1ff2e0a 100644
--- a/roles/container_runtime/templates/crio.conf.j2
+++ b/roles/container_runtime/templates/crio.conf.j2
@@ -27,7 +27,7 @@ storage_option = [
[crio.api]
# listen is the path to the AF_LOCAL socket on which crio will listen.
-listen = "/var/run/crio.sock"
+listen = "/var/run/crio/crio.sock"
# stream_address is the IP address on which the stream server will listen
stream_address = ""
diff --git a/roles/openshift_node/templates/node.yaml.v1.j2 b/roles/openshift_node/templates/node.yaml.v1.j2
index 16fdde02e..261cac6f1 100644
--- a/roles/openshift_node/templates/node.yaml.v1.j2
+++ b/roles/openshift_node/templates/node.yaml.v1.j2
@@ -20,9 +20,9 @@ kubeletArguments: {{ openshift.node.kubelet_args | default(None) | to_padded_yam
container-runtime:
- remote
container-runtime-endpoint:
- - /var/run/crio.sock
+ - /var/run/crio/crio.sock
image-service-endpoint:
- - /var/run/crio.sock
+ - /var/run/crio/crio.sock
node-labels:
- router=true
- registry=true