From 99b8f0902e1960e43c6d7d4cdaddb63dfa2b46a6 Mon Sep 17 00:00:00 2001
From: Hans Feldt <2808287+hafe@users.noreply.github.com>
Date: Wed, 7 Oct 2020 09:10:42 +0200
Subject: [PATCH] crio: ensure service is started and enabled (#6753)

---
 roles/container-engine/cri-o/tasks/main.yaml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/roles/container-engine/cri-o/tasks/main.yaml b/roles/container-engine/cri-o/tasks/main.yaml
index 6b6f114d2..504330d13 100644
--- a/roles/container-engine/cri-o/tasks/main.yaml
+++ b/roles/container-engine/cri-o/tasks/main.yaml
@@ -1,5 +1,4 @@
 ---
-
 - name: check if fedora coreos
   stat:
     path: /run/ostree-booted
@@ -9,7 +8,6 @@
   set_fact:
     is_ostree: "{{ ostree.stat.exists }}"
 
-
 - name: gather os specific variables
   include_vars: "{{ item }}"
   with_first_found:
@@ -46,7 +44,6 @@
     state: present
   when: not is_ostree
   with_items: "{{ crio_packages }}"
-  notify: restart crio
   register: package_install
   until: package_install is succeeded
   retries: 4
@@ -99,6 +96,7 @@
   template:
     src: crio.conf.j2
     dest: /etc/crio/crio.conf
+  notify: restart crio
 
 - name: Copy mounts.conf
   copy:
@@ -125,10 +123,24 @@
     - ansible_distribution == "CentOS"
     - ansible_distribution_major_version == "7"
 
-
 - name: Write cri-o proxy drop-in
   template:
     src: http-proxy.conf.j2
     dest: /etc/systemd/system/crio.service.d/http-proxy.conf
   notify: restart crio
   when: http_proxy is defined or https_proxy is defined
+
+- name: Ensure crio service is started and enabled
+  service:
+    name: crio
+    daemon_reload: true
+    enabled: true
+    state: started
+
+- name: Verify that crio is running
+  command: "crio-status info"
+  register: get_crio_info
+  until: get_crio_info is succeeded
+  changed_when: false
+  retries: 5
+  delay: "{{ retry_stagger | random + 3 }}"