diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-31 09:53:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-31 09:53:25 -0700 |
| commit | 3e2f7911f08504e7da8344df28f008a81897c329 (patch) | |
| tree | d69b1c0df70f3ebaf15b5bda85ef03d9896f16a6 | |
| parent | 826455338b15c82cee16656b90e4689cf1b9a165 (diff) | |
| parent | fac20bb529215737014ab47b8e0aeaa64f88c7a6 (diff) | |
| download | openshift-3e2f7911f08504e7da8344df28f008a81897c329.tar.gz openshift-3e2f7911f08504e7da8344df28f008a81897c329.tar.bz2 openshift-3e2f7911f08504e7da8344df28f008a81897c329.tar.xz openshift-3e2f7911f08504e7da8344df28f008a81897c329.zip | |
Merge pull request #5932 from mgugino-upstream-stage/retry-docker-creds
Automatic merge from submit-queue.
Add retry logic to docker auth credentials
This commit enables retry on docker login commands.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1506931
| -rw-r--r-- | roles/docker/tasks/registry_auth.yml | 4 | ||||
| -rw-r--r-- | roles/openshift_master/tasks/registry_auth.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node/tasks/registry_auth.yml | 3 | ||||
| -rw-r--r-- | roles/openshift_node_upgrade/tasks/registry_auth.yml | 3 |
4 files changed, 13 insertions, 0 deletions
diff --git a/roles/docker/tasks/registry_auth.yml b/roles/docker/tasks/registry_auth.yml index 65ed60efa..d05b7f2b8 100644 --- a/roles/docker/tasks/registry_auth.yml +++ b/roles/docker/tasks/registry_auth.yml @@ -7,6 +7,10 @@ - name: Create credentials for docker cli registry auth command: "docker --config={{ docker_cli_auth_config_path }} login -u {{ oreg_auth_user }} -p {{ oreg_auth_password }} {{ oreg_host }}" + register: openshift_docker_credentials_create_res + retries: 3 + delay: 5 + until: openshift_docker_credentials_create_res.rc == 0 when: - oreg_auth_user is defined - (not docker_cli_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool diff --git a/roles/openshift_master/tasks/registry_auth.yml b/roles/openshift_master/tasks/registry_auth.yml index 63d483760..cde01c49e 100644 --- a/roles/openshift_master/tasks/registry_auth.yml +++ b/roles/openshift_master/tasks/registry_auth.yml @@ -11,6 +11,9 @@ - oreg_auth_user is defined - (not master_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool register: master_oreg_auth_credentials_create + retries: 3 + delay: 5 + until: master_oreg_auth_credentials_create.rc == 0 notify: - restart master api - restart master controllers diff --git a/roles/openshift_node/tasks/registry_auth.yml b/roles/openshift_node/tasks/registry_auth.yml index de396fb4b..5e5e4f94a 100644 --- a/roles/openshift_node/tasks/registry_auth.yml +++ b/roles/openshift_node/tasks/registry_auth.yml @@ -11,6 +11,9 @@ - oreg_auth_user is defined - (not node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool register: node_oreg_auth_credentials_create + retries: 3 + delay: 5 + until: node_oreg_auth_credentials_create.rc == 0 notify: - restart node diff --git a/roles/openshift_node_upgrade/tasks/registry_auth.yml b/roles/openshift_node_upgrade/tasks/registry_auth.yml index de396fb4b..5e5e4f94a 100644 --- a/roles/openshift_node_upgrade/tasks/registry_auth.yml +++ b/roles/openshift_node_upgrade/tasks/registry_auth.yml @@ -11,6 +11,9 @@ - oreg_auth_user is defined - (not node_oreg_auth_credentials_stat.stat.exists or oreg_auth_credentials_replace) | bool register: node_oreg_auth_credentials_create + retries: 3 + delay: 5 + until: node_oreg_auth_credentials_create.rc == 0 notify: - restart node |