Update deprecated crio.sock

Deprecation warning message:
```
W0726 19:42:01.399525    6438 util_unix.go:75] Using
"/var/run/crio/crio.sock" as endpoint is deprecated, please consider
using full url format "unix:///var/run/crio/crio.sock".
```

roles/container_runtime/defaults/main.yml

@@ -79,8 +79,6 @@ openshift_crio_pause_image: "{{ l_os_registry_url | regex_replace('${component}'
 
 l_required_docker_version: '1.13'
 
-l_crio_var_sock: "/var/run/crio/crio.sock"
-
 l_insecure_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l2_docker_insecure_registries)) }}"
 l_crio_registries: "{{ l2_docker_additional_registries + ['docker.io'] }}"
 l_additional_crio_registries: "{{ '\"{}\"'.format('\", \"'.join(l_crio_registries)) }}"

roles/container_runtime/tasks/package_crio.yml

@@ -57,6 +57,12 @@
     src: crio.conf.j2
     backup: yes
 
+- name: Update crictl.yaml runtime-endpoint
+  yedit:
+    src: /etc/crictl.yaml
+    key: runtime-endpoint
+    value: "{{ openshift_crio_var_sock }}"
+
 - name: Ensure CNI configuration directory exists
   file:
     path: /etc/cni/net.d/

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 = "{{ l_crio_var_sock }}"
+listen = "/var/run/crio/crio.sock"
 
 # stream_address is the IP address on which the stream server will listen
 stream_address = ""

roles/openshift_facts/defaults/main.yml

@@ -40,6 +40,7 @@ repoquery_installed: "{{ (ansible_pkg_mgr == 'dnf') | ternary('dnf repoquery --l
 openshift_use_crio: False
 openshift_use_crio_only: False
 openshift_crio_enable_docker_gc: True
+openshift_crio_var_sock: "unix:///var/run/crio/crio.sock"
 
 # osm_default_subdomain is an old migrated fact, can probably be removed.
 osm_default_subdomain: "router.default.svc.cluster.local"

roles/openshift_node/defaults/main.yml

@@ -145,7 +145,6 @@ r_openshift_node_os_firewall_allow: "{{ default_r_openshift_node_os_firewall_all
 # oreg_url is defined by user input
 oreg_auth_credentials_path: "{{ openshift_node_data_dir }}/.docker"
 l_bind_docker_reg_auth: False
-l_crio_var_sock: "/var/run/crio/crio.sock"
 
 openshift_docker_service_name: "docker"
 

roles/openshift_node/tasks/upgrade.yml

@@ -41,6 +41,14 @@
   - "/etc/cni/net.d/100-crio-bridge.conf"
   when: crio_update is changed
 
+- name: Ensure crictl.yaml runtime-endpoint is updated
+  yedit:
+    src: /etc/crictl.yaml
+    key: runtime-endpoint
+    value: "{{ openshift_crio_var_sock }}"
+  when:
+  - openshift_use_crio | default(False) | bool
+
 - name: install pre-pulled rpms.
   import_tasks: upgrade/rpm_upgrade_install.yml
   when: not openshift_is_atomic | bool

roles/openshift_node_group/defaults/main.yml

@@ -1,6 +1,4 @@
 ---
-l_crio_var_sock: "/var/run/crio/crio.sock"
-
 openshift_node_group_cloud_provider: "{{ openshift_cloudprovider_kind | default('') }}"
 openshift_node_group_network_plugin_default: "{{ os_sdn_network_plugin_name }}"
 openshift_node_group_network_plugin: "{{ openshift_node_group_network_plugin_default }}"

roles/openshift_node_group/templates/node-config.yaml.j2

@@ -28,9 +28,9 @@ kubeletArguments:
   container-runtime:
   - remote
   container-runtime-endpoint:
-  - {{ l_crio_var_sock }}
+  - {{ openshift_crio_var_sock }}
   image-service-endpoint:
-  - {{ l_crio_var_sock }}
+  - {{ openshift_crio_var_sock }}
   runtime-request-timeout:
   - 10m
 {% endif %}