diff options
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/tasks/main.yml | 4 | ||||
| -rw-r--r-- | roles/docker/templates/crio.conf.j2 | 2 | 
2 files changed, 3 insertions, 3 deletions
| diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 1f9ac5059..78c6671d8 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -7,8 +7,8 @@  - set_fact:      l_use_system_container: "{{ openshift.docker.use_system_container | default(False) }}" -    l_use_crio: "{{ openshift.docker.use_crio | default(False) }}" -    l_use_crio_only: "{{ openshift.docker.use_crio_only | default(False) }}" +    l_use_crio: "{{ openshift_use_crio | default(False) }}" +    l_use_crio_only: "{{ openshift_use_crio_only | default(False) }}"  - name: Use Package Docker if Requested    include: package_docker.yml diff --git a/roles/docker/templates/crio.conf.j2 b/roles/docker/templates/crio.conf.j2 index eae1759ab..5b31932b1 100644 --- a/roles/docker/templates/crio.conf.j2 +++ b/roles/docker/templates/crio.conf.j2 @@ -43,7 +43,7 @@ stream_port = "10010"  # This is a mandatory setting as this runtime will be the default one  # and will also be used for untrusted container workloads if  # runtime_untrusted_workload is not set. -runtime = "/usr/libexec/crio/runc" +runtime = "/usr/bin/runc"  # runtime_untrusted_workload is the OCI compatible runtime used for untrusted  # container workloads. This is an optional setting, except if | 
