openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Revert "Allow deleting all of docker cache"

Browse Source 
This reverts commit 70b1203110.

With the post-upload cleanup this change is no longer required.

Change-Id: Id84ceab916f7225be0864a7bb60f96d5e3eda815
Depends-On: Ic0424638b9ddbf77e10cfe936d0b96ff2da1a59e
This commit is contained in:
Steve Baker 2017-12-06 01:59:58 +00:00
parent d63ef20cc3
commit 77fa67a35f
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/overcloud-prep-containers/defaults/main.yml
View File

@ -4,8 +4,4 @@ tripleo_common_dir: /usr/share/openstack-tripleo-common
containerized_overcloud: false
overcloud_prep_containers_script: overcloud-prep-containers.sh.j2
overcloud_prep_containers_log: overcloud_prep_containers.log
# Be careful with this setting as it entirely wipes the /var/lib/docker directory
# Useful in CI to workaround disk space issue
# https://bugs.launchpad.net/tripleo/+bug/1694709
delete_docker_cache: false
prepare_service_env_args: -e {{ overcloud_templates_path }}/environments/docker.yaml

10
roles/overcloud-prep-containers/templates/overcloud-prep-containers.sh.j2
View File

@ -58,16 +58,6 @@ openstack overcloud container image prepare \
openstack overcloud container image upload --verbose --config-file {{ working_dir }}/overcloud_containers.yaml
{% if delete_docker_cache|bool %}
## * Delete Docker Cache
## ::
# This is the most efficient way to wipe all of docker data
sudo systemctl stop docker
sudo rm -rf /var/lib/docker
sudo systemctl start docker
{% endif %}
## * Configure the {{ working_dir }}/containers-default-parameters.yaml, this is done automatically.
## ::