From 9f7a49f0e6a98d4d24b6b8ed668325da0ae495ce Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Wed, 18 Nov 2020 09:49:54 +0800 Subject: [PATCH] stx-puppet: add re-tries to workaround docker login failure Add re-tries to workaround the follwoing docker login failure: Error: docker login registry.local:9001 -u admin -p St8rlingX* returned 1 instead of one of [0] Error: /Stage[main]/Platform::Kubernetes::Master::Init/Exec[login local registry]/returns: change from notrun to 0 failed: docker login registry.local:9001 -u admin -p St8rlingX* returned 1 instead of one of [0] Issue-ID: INF-204 Signed-off-by: Jackie Huang Change-Id: I7087b8b5e27baa617bebbada0a09953299829432 --- ...bernetes.pp-add-re-tries-for-docker-login.patch | 28 ++++++++++++++++++++++ meta-stx/recipes-support/puppet/stx-puppet_git.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch 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 new file mode 100644 index 0000000..611ba73 --- /dev/null +++ b/meta-stx/recipes-support/puppet/files/stx-puppet/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch @@ -0,0 +1,28 @@ +From 911ce04cdb47f110e8f9bd8be79ab69fcf13b107 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 + +Upstream-Status: Inappropriate [workaround] + +Signed-off-by: Jackie Huang +--- + puppet-manifests/src/modules/platform/manifests/kubernetes.pp | 2 ++ + 1 file changed, 2 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 +--- 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 + -> 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 { 'kubeadm to pre pull images': +-- +2.7.4 + diff --git a/meta-stx/recipes-support/puppet/stx-puppet_git.bb b/meta-stx/recipes-support/puppet/stx-puppet_git.bb index e58d2dd..840cce1 100644 --- a/meta-stx/recipes-support/puppet/stx-puppet_git.bb +++ b/meta-stx/recipes-support/puppet/stx-puppet_git.bb @@ -52,6 +52,7 @@ SRC_URI = " \ file://${BPN}/0008-puppet-manifests-keystone-include-platform-client.patch \ file://${BPN}/0009-puppet-manifests-lvm-remove-lvmetad.patch \ file://${BPN}/0010-puppet-manifest-apply-workaround-to-ignore-known-err.patch \ + file://${BPN}/0011-puppet-manifest-kubernetes.pp-add-re-tries-for-docker-login.patch \ file://${BPN}/get-boot-device-from-cmdline.patch \ file://${BPN}/poky-specific-apply-network-config-script.patch \ file://${BPN}/apply_network_config_poky.sh \ -- 2.16.6