From 5a54d57fdab0438bc4b5187d2b57fb87a170043d Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 1 May 2020 10:57:41 -0400 Subject: [PATCH] container_manage: introduce create_retries and exec_retries vars tripleo_container_manage_create_retries and tripleo_container_manage_exec_retries (default to 60) will allow a timeout of 10 minutes for both podman exec and podman run commands. Indeed, some containers (db-sync or when puppet runs) can take up to 10 minute to execute and finish. Change-Id: Iff752cd124546bdd7cf857b0dacfc7d33b9a71a6 --- .../roles/tripleo_container_manage/defaults/main.yml | 6 ++++++ .../roles/tripleo_container_manage/tasks/podman/create.yml | 2 +- .../roles/tripleo_container_manage/tasks/podman/exec.yml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml b/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml index 3e7500a86..c511fe554 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/defaults/main.yml @@ -26,6 +26,12 @@ tripleo_container_manage_config_id: tripleo tripleo_container_manage_config_overrides: {} tripleo_container_manage_config_patterns: '*.json' tripleo_container_manage_debug: false +# Some containers where Puppet is run, can take up to 10 minutes to finish +# in slow environments. +tripleo_container_manage_create_retries: 60 +# Default delay is 10s so 60 retries makes a timeout of 10 minutes which is +# what we have observed a necessary value for nova and neutron db-sync execs. +tripleo_container_manage_exec_retries: 60 tripleo_container_manage_healthcheck_disabled: false tripleo_container_manage_log_path: '/var/log/containers/stdouts' tripleo_container_manage_systemd_order: false diff --git a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml index abb242dc5..4e0f0abb1 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/create.yml @@ -91,7 +91,7 @@ loop_var: "create_async_result_item" register: create_async_poll_results until: create_async_poll_results.finished - retries: 60 + retries: "{{ tripleo_container_manage_create_retries }}" # We fail later if a container has failed to start failed_when: false when: diff --git a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml index 5242a7fd3..b8f91a55e 100644 --- a/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml +++ b/tripleo_ansible/roles/tripleo_container_manage/tasks/podman/exec.yml @@ -42,7 +42,7 @@ loop_var: "exec_async_result_item" register: exec_async_poll_results until: exec_async_poll_results.finished - retries: 30 + retries: "{{ tripleo_container_manage_exec_retries }}" when: not ansible_check_mode|bool - name: Block for container commands