From fbbfff3795daffa8d9cd69244781f768d1c99d59 Mon Sep 17 00:00:00 2001
From: okamototk <toraneko@gmail.com>
Date: Wed, 31 Jul 2019 03:58:11 +0900
Subject: [PATCH] fix broken ubuntu containerd engine (#5002)

---
 roles/container-engine/containerd/tasks/main.yml        | 2 +-
 roles/container-engine/containerd/vars/ubuntu-amd64.yml | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/roles/container-engine/containerd/tasks/main.yml b/roles/container-engine/containerd/tasks/main.yml
index f148b6959..a649daae1 100644
--- a/roles/container-engine/containerd/tasks/main.yml
+++ b/roles/container-engine/containerd/tasks/main.yml
@@ -101,7 +101,7 @@
 
 - name: Check if runc is installed
   stat:
-    path: /usr/sbin/runc
+    path: "{{ runc_binary }}"
   register: runc_stat
 
 - name: Install runc package if necessary
diff --git a/roles/container-engine/containerd/vars/ubuntu-amd64.yml b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
index 1614eeea9..3b49c2f67 100644
--- a/roles/container-engine/containerd/vars/ubuntu-amd64.yml
+++ b/roles/container-engine/containerd/vars/ubuntu-amd64.yml
@@ -3,6 +3,7 @@
 containerd_versioned_pkg:
   'latest': "{{ containerd_package }}"
   '1.2.4': "{{ containerd_package }}=1.2.4-1"
+  '1.2.6': "{{ containerd_package }}=1.2.6-3"
   'stable': "{{ containerd_package }}=1.2.4-1"
   'edge': "{{ containerd_package }}=1.2.4-1"
 
@@ -25,3 +26,5 @@ containerd_repo_info:
        deb {{ containerd_ubuntu_repo_base_url }}
        {{ ansible_distribution_release|lower }}
        {{ containerd_ubuntu_repo_component }}
+
+runc_binary: /usr/bin/runc