Set documented default directory for filesystem

We document that the default value of filesystem_store_datadir is
/var/lib/glance/images without ever actually setting that default.

Co-Authored-By: kairat_kushaev <kkushaev@mirantis.com>
Closes-bug: #1501662
Change-Id: If6ab4f727f205c7828f247c7588b1f9bad78d1e8
This commit is contained in:
Ian Cordasco 2015-10-10 10:04:59 -05:00 committed by Flavio Percoco
parent adafb675ae
commit f5fd1bcd96
3 changed files with 19 additions and 8 deletions

View File

@ -47,6 +47,7 @@ _LW = i18n._LW
_FILESYSTEM_CONFIGS = [
cfg.StrOpt('filesystem_store_datadir',
default='/var/lib/glance/images',
help=_('Directory to which the Filesystem backend '
'store writes images.')),
cfg.MultiStrOpt('filesystem_store_datadirs',

View File

@ -378,8 +378,9 @@ class TestStore(base.StoreBaseTest,
"""
store_map = [self.useFixture(fixtures.TempDir()).path,
self.useFixture(fixtures.TempDir()).path]
self.conf.clear_override('filesystem_store_datadir',
group='glance_store')
self.conf.set_override('filesystem_store_datadir',
override=None,
group='glance_store')
self.conf.set_override('filesystem_store_datadirs',
[store_map[0] + ":100",
store_map[1] + ":200"],
@ -491,8 +492,9 @@ class TestStore(base.StoreBaseTest,
"""
store_map = [self.useFixture(fixtures.TempDir()).path,
self.useFixture(fixtures.TempDir()).path]
self.conf.clear_override('filesystem_store_datadir',
group='glance_store')
self.conf.set_override('filesystem_store_datadir',
override=None,
group='glance_store')
self.conf.set_override('filesystem_store_datadirs',
[store_map[0] + ":100",
store_map[1] + ":200",
@ -538,8 +540,10 @@ class TestStore(base.StoreBaseTest,
"""Test adding multiple filesystem directories."""
store_map = [self.useFixture(fixtures.TempDir()).path,
self.useFixture(fixtures.TempDir()).path]
self.conf.clear_override('filesystem_store_datadir',
group='glance_store')
self.conf.set_override('filesystem_store_datadir',
override=None,
group='glance_store')
self.conf.set_override('filesystem_store_datadirs',
[store_map[0] + ":100",
store_map[1] + ":200"],
@ -585,8 +589,9 @@ class TestStore(base.StoreBaseTest,
"""
store_map = [self.useFixture(fixtures.TempDir()).path,
self.useFixture(fixtures.TempDir()).path]
self.conf.clear_override('filesystem_store_datadir',
group='glance_store')
self.conf.set_override('filesystem_store_datadir',
override=None,
group='glance_store')
self.conf.set_override('filesystem_store_datadirs',
[store_map[0] + ":100",
store_map[1] + ":200"],

View File

@ -0,0 +1,5 @@
---
other:
- For years, `/var/lib/glance/images` has been presented as the default dir
for the filesystem store. It was not part of the default value until now.
New deployments and ppl overriding config files should watch for this.