From a8e83e130d999fecc217cc8581558193da780bc7 Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Thu, 26 Jul 2012 21:12:49 +1000
Subject: Turn on base image cleanup by default.

Essex shipped with the libvirt image cache manager hobbled so it
wouldn't delete unused base images. Its been a while and we haven't
had a new bug reported in ages. Let's turn it on for Folsom. This
is tracked by bug 1029674.

Change-Id: I5529232bf4a316f844d383d5f5a3c0c287d59c1f
---
 etc/nova/nova.conf.sample       | 2 +-
 nova/virt/libvirt/imagecache.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 879838eb7..e03b8363e 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -1440,7 +1440,7 @@
 
 ######## defined in nova.virt.libvirt.imagecache ########
 
-# remove_unused_base_images=false
+# remove_unused_base_images=true
 #### (BoolOpt) Should unused base images be removed?
 
 # remove_unused_resized_minimum_age_seconds=3600
diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py
index 01c0046a0..9825cc689 100644
--- a/nova/virt/libvirt/imagecache.py
+++ b/nova/virt/libvirt/imagecache.py
@@ -42,7 +42,7 @@ LOG = logging.getLogger(__name__)
 
 imagecache_opts = [
     cfg.BoolOpt('remove_unused_base_images',
-                default=False,
+                default=True,
                 help='Should unused base images be removed?'),
     cfg.IntOpt('remove_unused_resized_minimum_age_seconds',
                default=3600,
-- 
cgit