~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/virt/libvirt/imagecache.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
ImportĀ upstreamĀ versionĀ 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
#!/usr/bin/python
2
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
3
2
 
4
3
# Copyright 2012 Michael Still and Canonical Inc
42
41
 
43
42
imagecache_opts = [
44
43
    cfg.BoolOpt('remove_unused_base_images',
45
 
                default=False,
 
44
                default=True,
46
45
                help='Should unused base images be removed?'),
47
46
    cfg.IntOpt('remove_unused_resized_minimum_age_seconds',
48
47
               default=3600,
143
142
                             task_states.RESIZE_MIGRATED,
144
143
                             task_states.RESIZE_FINISH]
145
144
            if instance['task_state'] in resize_states or \
146
 
                instance['vm_state'] in vm_states.RESIZED:
 
145
                instance['vm_state'] == vm_states.RESIZED:
147
146
                self.instance_names.add(instance['name'] + '_resize')
148
147
 
149
148
            image_ref_str = str(instance['image_ref'])