diff options
| author | Michael Still <mikal@stillhq.com> | 2012-02-06 15:32:43 +1100 |
|---|---|---|
| committer | Michael Still <mikal@stillhq.com> | 2012-02-06 16:37:02 +1100 |
| commit | e01d5a2a23b6030bc38cc809014e62c506303c89 (patch) | |
| tree | e1e87bc5b46da36b9c432bd86de6ca5d46fa13ca | |
| parent | e9fd01e58b6a83b400ce9825f2543cb6ef476f00 (diff) | |
| download | nova-e01d5a2a23b6030bc38cc809014e62c506303c89.tar.gz nova-e01d5a2a23b6030bc38cc809014e62c506303c89.tar.xz nova-e01d5a2a23b6030bc38cc809014e62c506303c89.zip | |
Fix broken flag in test_imagecache
Removing the duplicate instances_path flag in
nova/virt/libvirt in https://review.openstack.org/#change,3759
broke the imagecache unit tests.
Change-Id: I8fed15bd22d88a7796e1f98981c3ad87358a244a
| -rw-r--r-- | nova/tests/test_imagecache.py | 2 | ||||
| -rw-r--r-- | nova/virt/libvirt/imagecache.py | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/nova/tests/test_imagecache.py b/nova/tests/test_imagecache.py index e624a93d8..dee937bd2 100644 --- a/nova/tests/test_imagecache.py +++ b/nova/tests/test_imagecache.py @@ -32,7 +32,9 @@ from nova.virt.libvirt import imagecache from nova.virt.libvirt import utils as virtutils +flags.DECLARE('instances_path', 'nova.compute.manager') FLAGS = flags.FLAGS + LOG = logging.getLogger('nova.tests.test_imagecache') diff --git a/nova/virt/libvirt/imagecache.py b/nova/virt/libvirt/imagecache.py index 00c22ab49..04b35f1ef 100644 --- a/nova/virt/libvirt/imagecache.py +++ b/nova/virt/libvirt/imagecache.py @@ -52,6 +52,7 @@ imagecache_opts = [ 'removed'), ] +flags.DECLARE('instances_path', 'nova.compute.manager') FLAGS = flags.FLAGS FLAGS.add_options(imagecache_opts) |