Merge "Armada image not found by script 76"
This commit is contained in:
commit
63b36b2dae
|
@ -308,33 +308,39 @@ def remove_docker_images():
|
||||||
return False
|
return False
|
||||||
|
|
||||||
client = CgtsClient()
|
client = CgtsClient()
|
||||||
armada_image = None
|
armada_images = []
|
||||||
tiller_image = None
|
|
||||||
|
|
||||||
# Get image names
|
# Get image names
|
||||||
filter_out_untagged = False
|
filter_out_untagged = False
|
||||||
image_list = client.sysinv.registry_image.list(int(filter_out_untagged))
|
image_list = client.sysinv.registry_image.list(int(filter_out_untagged))
|
||||||
if not image_list:
|
if not image_list:
|
||||||
LOG.warning("Failed to remove armada docker image.")
|
LOG.warning("No images were returned from the image registry."
|
||||||
|
"Aborting image cleanup")
|
||||||
return False
|
return False
|
||||||
|
|
||||||
for image in image_list:
|
for image in image_list:
|
||||||
if "airshipit/armada" in image.name:
|
if any(x in image.name for x in (
|
||||||
armada_image = image.name
|
'airshipit/armada',
|
||||||
elif "helm/tiller" in image.name:
|
'starlingx/armada-image',
|
||||||
tiller_image = image.name
|
'helm/tiller')
|
||||||
|
):
|
||||||
|
armada_images.append(image.name)
|
||||||
|
|
||||||
if not armada_image and not tiller_image:
|
if armada_images:
|
||||||
LOG.debug("Could not find armada and tiller images in "
|
deletion_success = True
|
||||||
"docker registry.")
|
for image in armada_images:
|
||||||
return True
|
LOG.info("Deleting image: %s" % image)
|
||||||
|
|
||||||
# Delete images
|
if not delete_images(image):
|
||||||
if delete_images(armada_image) and delete_images(tiller_image):
|
LOG.error("Could not delete image: %s. Continuing..." % image)
|
||||||
|
deletion_success = False
|
||||||
|
|
||||||
|
LOG.info("Running image garbage collect.")
|
||||||
client.sysinv.registry_image.garbage_collect()
|
client.sysinv.registry_image.garbage_collect()
|
||||||
|
return deletion_success
|
||||||
else:
|
else:
|
||||||
return False
|
LOG.info("No armada/tiller images are present in the registry.")
|
||||||
|
return True
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def drop_helm_v2_database():
|
def drop_helm_v2_database():
|
||||||
|
|
Loading…
Reference in New Issue