Merge "Adds Docker image pruning command"

This commit is contained in:
Zuul 2020-01-27 16:11:37 +00:00 committed by Gerrit Code Review
commit 0580d00342
8 changed files with 50 additions and 0 deletions

9
ansible/prune-images.yml Normal file
View File

@ -0,0 +1,9 @@
---
- import_playbook: gather-facts.yml
- name: Apply role prune-images
hosts: baremetal
serial: '{{ kolla_serial|default("0") }}'
gather_facts: false
roles:
- prune-images

View File

@ -0,0 +1,2 @@
---
docker_image_prune_timeout: 300

View File

@ -0,0 +1,4 @@
---
- include_tasks: validate_docker_execute.yml
- include_tasks: prune_images.yml

View File

@ -0,0 +1,8 @@
---
- name: Pruning Kolla images
become: true
docker_prune:
images: yes
images_filters:
label: kolla_version
timeout: "{{ docker_image_prune_timeout }}"

View File

@ -0,0 +1,3 @@
---
- name: Ensure the docker service is running
script: ../tools/validate-docker-execute.sh

View File

@ -191,6 +191,9 @@ tests.
``kolla-ansible -i INVENTORY deploy-containers`` is used to check and if
necessary update containers, without generating configuration.
``kolla-ansible -i INVENTORY prune-images`` is used to prune orphaned Docker
images on hosts.
.. note::
In order to do smoke tests, requires ``kolla_enable_sanity_checks=yes``.

View File

@ -0,0 +1,7 @@
---
features:
- |
Adds command ``prune-images`` for Docker image pruning on hosts. See
`blueprint
<https://blueprints.launchpad.net/kolla-ansible/+spec/docker-image-pruning>`__
for details.

View File

@ -88,6 +88,7 @@ Commands:
upgrade Upgrades existing OpenStack Environment
upgrade-bifrost Upgrades an existing bifrost container
genconfig Generate configuration files for enabled OpenStack services
prune-images Prune orphaned Kolla images
EOF
}
@ -126,6 +127,7 @@ certificates
upgrade
upgrade-bifrost
genconfig
prune-images
EOF
}
@ -391,6 +393,18 @@ EOF
ACTION="Generate configuration files for enabled OpenStack services"
EXTRA_OPTS="$EXTRA_OPTS -e kolla_action=config"
;;
(prune-images)
ACTION="Prune orphaned Kolla images"
PLAYBOOK="${BASEDIR}/ansible/prune-images.yml"
if [[ "${DANGER_CONFIRM}" != "--yes-i-really-really-mean-it" ]]; then
cat << EOF
WARNING:
This will PERMANENTLY DELETE all orphaned kolla images. To confirm, please add the following option:
--yes-i-really-really-mean-it
EOF
exit 1
fi
;;
(bash-completion)
bash_completion
exit 0