summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-14 14:45:58 -0500
committerGitHub <noreply@github.com>2017-12-14 14:45:58 -0500
commit335531417d923122f142b970cd4e8143cef411f9 (patch)
treee4edab6f382f045e4b68f6313464ef749641656a
parent67db90531b25cae235eaa093d3d55a20c08d482d (diff)
parent646dac7564181c8ca8be9f16dcb5887cfbb7d8fb (diff)
downloadopenshift-335531417d923122f142b970cd4e8143cef411f9.tar.gz
openshift-335531417d923122f142b970cd4e8143cef411f9.tar.bz2
openshift-335531417d923122f142b970cd4e8143cef411f9.tar.xz
openshift-335531417d923122f142b970cd4e8143cef411f9.zip
Merge pull request #6449 from giuseppe/crio-change-socket-path
crio: change socket path to /var/run/crio/crio.sock
-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