From 9977af6534bef19eb246c8a508e415b18bd8b26d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Fri, 20 Nov 2020 18:19:58 +0800 Subject: [PATCH] stx-puppet: add re-tries in the patch for another case The docker login in platform::kubernetes::worker::init may also fail sometimes, so add the re-tries as well. Issue-ID: INF-204 Signed-off-by: Jackie Huang Change-Id: I30c125e21665d59d5216303f636beb04ae924380 --- ...st-kubernetes.pp-add-re-tries-for-docker-login.patch | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch b/meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch index 611ba73..0c5f162 100644 --- a/meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch +++ b/meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch @@ -1,4 +1,4 @@ -From 911ce04cdb47f110e8f9bd8be79ab69fcf13b107 Mon Sep 17 00:00:00 2001 +From 3d8cce4420f84bac979e9b10384fddb4d7c810d9 Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 18 Nov 2020 09:45:54 +0800 Subject: [PATCH] kubernetes.pp: add re-tries for docker login @@ -7,11 +7,11 @@ Upstream-Status: Inappropriate [workaround] Signed-off-by: Jackie Huang --- - puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 2 ++ - 1 file changed, 2 insertions(+) + puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 4 ++++ + 1 file changed, 4 insertions(+) diff --git a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp -index 3fa1c8a..393ea6b 100644 +index 3fa1c8a..af69373 100644 --- a/puppet-manifests/src/modules/platform/manifests/kubernetes.pp +++ b/puppet-manifests/src/modules/platform/manifests/kubernetes.pp @@ -269,6 +269,8 @@ class platform::kubernetes::master::init @@ -23,6 +23,15 @@ index 3fa1c8a..393ea6b 100644 } -> exec { 'kubeadm to pre pull images': +@@ -384,6 +386,8 @@ class platform::kubernetes::worker::init + exec { 'login local registry': + command => "docker login registry.local:9001 -u ${::platform::dockerdistribution::params::registry_username} -p ${::platform::dockerdistribution::params::registry_password}", # lint:ignore:140chars + logoutput => true, ++ tries => 3, ++ try_sleep => 1, + } + + -> exec { 'load k8s pause image': -- 2.7.4 -- 2.16.6