From 1e524c68d5c04b6fc3a061b4bc30844fd7ab56b0 Mon Sep 17 00:00:00 2001
From: Sergey <luckysb75@gmail.com>
Date: Wed, 3 Apr 2019 11:37:44 +0300
Subject: [PATCH] remove our config if docker start failed (#4260)
---
roles/container-engine/docker/tasks/main.yml | 25 ++++++++++++++++----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml
index de0a60cb4..516f4b39b 100644
--- a/roles/container-engine/docker/tasks/main.yml
+++ b/roles/container-engine/docker/tasks/main.yml
@@ -199,11 +199,26 @@
mode: 0644
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS", "ClearLinux", "RedHat", "Suse"] or is_atomic)
-- name: ensure service is started if docker packages are already present
- service:
- name: docker
- state: started
- when: docker_task_result is not changed
+- name: ensure docker started, remove our config if docker start failed and try again
+ block:
+ - name: ensure service is started if docker packages are already present
+ service:
+ name: docker
+ state: started
+ when: docker_task_result is not changed
+ rescue:
+ - debug:
+ msg: "Docker start failed. Try to remove our config"
+ - name: remove kubespray generated config
+ file:
+ path: "{{ item }}"
+ state: absent
+ with_items:
+ - /etc/systemd/system/docker.service.d/http-proxy.conf
+ - /etc/systemd/system/docker.service.d/docker-options.conf
+ - /etc/systemd/system/docker.service.d/docker-dns.conf
+ - /etc/systemd/system/docker.service.d/docker-orphan-cleanup.conf
+ notify: restart docker
- name: flush handlers so we can wait for docker to come up
meta: flush_handlers
--
GitLab