Move store config opt to glance_store section

Store config options under DEFAULT section have been marked deprecated
and moved to glance_store section. With glance_store 0.10.0, the
deprecated options have been dropped, which causes the scrubber tests
to fail as they still have filesystem_store_datadir under DEFAULT section.
So, moving it under glance_store section here.

Closes-Bug: 1522132

Change-Id: If5c11a2b616d3e0b577de34cc0286b18adc327c2
This commit is contained in:
Hemanth Makkapati 2015-12-02 12:44:42 -06:00
parent a82c9e2eca
commit d33bcc0b7c

View File

@ -550,7 +550,6 @@ class ScrubberDaemon(Server):
self.conf_base = """[DEFAULT]
verbose = %(verbose)s
debug = %(debug)s
filesystem_store_datadir=%(image_dir)s
log_file = %(log_file)s
daemon = %(daemon)s
wakeup_time = 2
@ -563,6 +562,8 @@ sql_connection = %(sql_connection)s
sql_idle_timeout = 3600
send_identity_headers = %(send_identity_headers)s
admin_role = %(admin_role)s
[glance_store]
filesystem_store_datadir=%(image_dir)s
[oslo_policy]
policy_file = %(policy_file)s
policy_default_rule = %(policy_default_rule)s