From cd6dc467ce068afc42d325fdb0aeecd7eed3ee73 Mon Sep 17 00:00:00 2001 From: Sergii Golovatiuk Date: Thu, 8 Oct 2020 18:38:16 +0200 Subject: [PATCH] Retry container pull 3 times Pulling images over internet is not considered as very stable operation as there can be a lot of issues (DNS, HTTP rate limit, route change or interface restart ...) This patch retries "pull" 3 times to mitigate possible networking issues Change-Id: I03643576c9f8444d6db36364a73bccce244c8446 Closes-Bug: 1899057 --- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 4 ++++ deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 4 ++++ deployment/database/mysql-pacemaker-puppet.yaml | 4 ++++ deployment/database/redis-pacemaker-puppet.yaml | 4 ++++ deployment/haproxy/haproxy-pacemaker-puppet.yaml | 4 ++++ deployment/manila/manila-share-pacemaker-puppet.yaml | 4 ++++ deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 4 ++++ .../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 4 ++++ deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 4 ++++ .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 4 ++++ 10 files changed, 40 insertions(+) diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 0120745138..bc558488aa 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -236,6 +236,10 @@ outputs: cinder_backup_image_latest: *cinder_backup_image_pcmklatest - name: Pull latest cinder_backup images command: "{{container_cli}} pull {{cinder_backup_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous cinder_backup image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{cinder_backup_image_latest}}" register: old_cinder_backup_image_id diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index 277d7142b7..72a5924620 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -217,6 +217,10 @@ outputs: cinder_volume_image_latest: *cinder_volume_image_pcmklatest - name: Pull latest cinder_volume images command: "{{container_cli}} pull {{cinder_volume_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous cinder_volume image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{cinder_volume_image_latest}}" register: old_cinder_volume_image_id diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index 6172c0d36d..86db26b153 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -373,6 +373,10 @@ outputs: galera_image_latest: *mysql_image_pcmklatest - name: Pull latest galera images command: "{{container_cli}} pull {{galera_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous galera image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{galera_image_latest}}" register: old_galera_image_id diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index f06451ca71..bac98c2113 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -295,6 +295,10 @@ outputs: redis_image_latest: *redis_image_pcmklatest - name: Pull latest redis images command: "{{container_cli}} pull {{redis_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous redis image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{redis_image_latest}}" register: old_redis_image_id diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index ffe1d0e40a..8a8ba351e2 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -394,6 +394,10 @@ outputs: haproxy_image_latest: *haproxy_image_pcmklatest - name: Pull latest haproxy images command: "{{container_cli}} pull {{haproxy_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous haproxy image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{haproxy_image_latest}}" register: old_haproxy_image_id diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index c5e5b0f878..ec08ce9126 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -197,6 +197,10 @@ outputs: manila_share_image_latest: *manila_share_image_pcmklatest - name: Pull latest manila_share images command: "{{container_cli}} pull {{manila_share_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous manila_share image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{manila_share_image_latest}}" register: old_manila_share_image_id diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index 87132c7012..ae63b1fbdf 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -319,6 +319,10 @@ outputs: block: &ovn_dbs_fetch_retag_container_tasks - name: Pull latest ovn-dbs images command: "{{container_cli}} pull {{ovn_dbs_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous ovn_dbs image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{ovn_dbs_image_latest}}" register: old_ovn_dbs_image_id diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 0a97ae9d52..fa3d9f2b50 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -285,6 +285,10 @@ outputs: rabbitmq_image_latest: *rabbitmq_image_pcmklatest - name: Pull latest rabbitmq images command: "{{container_cli}} pull {{rabbitmq_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous rabbitmq image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{rabbitmq_image_latest}}" register: old_rabbitmq_image_id diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 6cf6d5d84d..0e7f6dd6ea 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -285,6 +285,10 @@ outputs: rabbitmq_image_latest: *rabbitmq_image_pcmklatest - name: Pull latest rabbitmq images command: "{{container_cli}} pull {{rabbitmq_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous rabbitmq image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{rabbitmq_image_latest}}" register: old_rabbitmq_image_id diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index db95ad8e78..51400210eb 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -289,6 +289,10 @@ outputs: rabbitmq_image_latest: *rabbitmq_image_pcmklatest - name: Pull latest rabbitmq images command: "{{container_cli}} pull {{rabbitmq_image}}" + register: result + retries: 3 + delay: 3 + until: result.rc == 0 - name: Get previous rabbitmq image id shell: "{{container_cli}} inspect --format '{{'{{'}}.Id{{'}}'}}' {{rabbitmq_image_latest}}" register: old_rabbitmq_image_id