Merge "Handle exceptions in sysinv due to missing service parameters"

This commit is contained in:
Zuul 2021-11-19 18:21:43 +00:00 committed by Gerrit Code Review
commit 2b44504c65
1 changed files with 5 additions and 1 deletions

View File

@ -3104,15 +3104,19 @@ class DockerHelper(object):
LOG.info("Image %s is not available in local registry, "
"download started from public/private registry"
% img_tag)
pub_img_tag = img_tag.replace(
constants.DOCKER_REGISTRY_SERVER + "/", "")
target_img_tag, registry_auth = \
self._get_img_tag_with_registry(pub_img_tag, registries_info)
client.pull(target_img_tag, auth_config=registry_auth)
except Exception as e:
rc = False
LOG.error("Image %s download failed from public/private"
"registry: %s" % (pub_img_tag, e))
"registry: %s" % (img_tag, e))
return img_tag, rc
try: