diff options
Diffstat (limited to 'roles/docker')
| -rw-r--r-- | roles/docker/handlers/main.yml | 3 | ||||
| -rw-r--r-- | roles/docker/tasks/package_docker.yml | 7 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 12 | 
3 files changed, 16 insertions, 6 deletions
diff --git a/roles/docker/handlers/main.yml b/roles/docker/handlers/main.yml index 3a4f4ba92..591367467 100644 --- a/roles/docker/handlers/main.yml +++ b/roles/docker/handlers/main.yml @@ -6,9 +6,8 @@      state: restarted    register: r_docker_restart_docker_result    until: not r_docker_restart_docker_result | failed -  retries: 1 +  retries: 3    delay: 30 -    when: not docker_service_status_changed | default(false) | bool  - name: restart udev diff --git a/roles/docker/tasks/package_docker.yml b/roles/docker/tasks/package_docker.yml index 9859b7b5a..bc52ab60c 100644 --- a/roles/docker/tasks/package_docker.yml +++ b/roles/docker/tasks/package_docker.yml @@ -123,9 +123,12 @@      enabled: yes      state: started      daemon_reload: yes -  register: start_result +  register: r_docker_package_docker_start_result +  until: not r_docker_package_docker_start_result | failed +  retries: 3 +  delay: 30  - set_fact: -    docker_service_status_changed: start_result | changed +    docker_service_status_changed: "{{ r_docker_package_docker_start_result | changed }}"  - meta: flush_handlers diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index d8c5ccfd3..57a84bc2c 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -46,6 +46,11 @@      state: stopped      daemon_reload: yes    ignore_errors: True +  register: r_docker_systemcontainer_docker_stop_result +  until: not r_docker_systemcontainer_docker_stop_result | failed +  retries: 3 +  delay: 30 +  # Set http_proxy, https_proxy, and no_proxy in /etc/atomic.conf  # regexp: the line starts with or without #, followed by the string @@ -160,9 +165,12 @@      enabled: yes      state: started      daemon_reload: yes -  register: start_result +  register: r_docker_systemcontainer_docker_start_result +  until: not r_docker_systemcontainer_docker_start_result | failed +  retries: 3 +  delay: 30  - set_fact: -    docker_service_status_changed: start_result | changed +    docker_service_status_changed: "{{ r_docker_systemcontainer_docker_start_result | changed }}"  - meta: flush_handlers  | 
