Created
December 29, 2018 14:20
-
-
Save nightmareze1/78b2d8d74eea66da445923e4632fb2bb to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
root@jenkins:/kubespray# git diff roles/container-engine/docker/handlers/main.yml | |
diff - git a/roles/container-engine/docker/handlers/main.yml b/roles/container-engine/docker/handlers/main.yml | |
index a43d843..6172d79 100644 | |
- - a/roles/container-engine/docker/handlers/main.yml | |
+++ b/roles/container-engine/docker/handlers/main.yml | |
@@ -17,10 +17,17 @@ | |
state: restarted | |
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS'] | |
- name: Docker | reload docker | |
service: | |
name: docker | |
state: restarted | |
+ force: yes | |
+ ignore_errors: true | |
root@jenkins:/kubespray# git diff roles/container-engine/docker/tasks/main.yml | |
diff - git a/roles/container-engine/docker/tasks/main.yml b/roles/container-engine/docker/tasks/main.yml | |
index 1b3c629..3d92386 100644 | |
- - a/roles/container-engine/docker/tasks/main.yml | |
+++ b/roles/container-engine/docker/tasks/main.yml | |
@@ -134,8 +134,8 @@ | |
update_cache: "{{ omit if ansible_distribution == 'Fedora' else True }}" | |
register: docker_task_result | |
until: docker_task_result is succeeded | |
- retries: 4 | |
- delay: "{{ retry_stagger | d(3) }}" | |
+ retries: 10 | |
+ delay: "{{ retry_stagger | d(8) }}" | |
with_items: "{{ docker_package_info.pkgs }}" | |
notify: restart docker | |
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) and (docker_package_info.pkgs|length > 0) | |
@@ -167,7 +167,8 @@ | |
- name: ensure service is started if docker packages are already present | |
service: | |
name: docker | |
- state: started | |
+ state: restarted | |
+ ignore_errors: true | |
when: docker_task_result is not changed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment