summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Carvalho <rhcarvalho@gmail.com>2017-08-30 16:11:57 +0200
committerGitHub <noreply@github.com>2017-08-30 16:11:57 +0200
commitc749ed96670fb4f31a9ecd140d549d9df4d05c57 (patch)
tree8e474e7ee5f1462189d35ce5c06da8ccb11237df
parent028a43739d2752b65e2d37c87ddf2296a22f0b90 (diff)
parentacf014f461a31de7d280d1e851d9a382f545d4c9 (diff)
downloadopenshift-c749ed96670fb4f31a9ecd140d549d9df4d05c57.tar.gz
openshift-c749ed96670fb4f31a9ecd140d549d9df4d05c57.tar.bz2
openshift-c749ed96670fb4f31a9ecd140d549d9df4d05c57.tar.xz
openshift-c749ed96670fb4f31a9ecd140d549d9df4d05c57.zip
Merge pull request #5228 from sosiouxme/20170825-timeout-skopeo
docker_image_availability: timeout skopeo inspect
-rw-r--r--roles/openshift_health_checker/openshift_checks/docker_image_availability.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
index 85a922f86..857a80c74 100644
--- a/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
+++ b/roles/openshift_health_checker/openshift_checks/docker_image_availability.py
@@ -168,7 +168,10 @@ class DockerImageAvailability(DockerHostMixin, OpenShiftCheck):
registries = [registry]
for registry in registries:
- args = {"_raw_params": "skopeo inspect --tls-verify=false docker://{}/{}".format(registry, image)}
+ args = {
+ "_raw_params": "timeout 10 skopeo inspect --tls-verify=false "
+ "docker://{}/{}".format(registry, image)
+ }
result = self.execute_module("command", args)
if result.get("rc", 0) == 0 and not result.get("failed"):
return True