openstack/glance
Code Issues Proposed changes

Replace usage of deprecated [DATABASE] sql_connection

Browse Source 
This option was deprecated in oslo.db a long ago and was removed in
master.

Change-Id: Iba6aa00e4f86fc4b82fa354fddf2fc7d6b47c52f
This commit is contained in:
Takashi Kajinami 2024-01-28 01:02:26 +09:00
parent f429b53e04
commit b6b9f043ff
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glance/tests/functional/__init__.py
View File

@ -181,8 +181,8 @@ class BaseServer(metaclass=abc.ABCMeta):
conf_filepath = os.path.join(conf_dir, 'glance-manage.conf') conf_filepath = os.path.join(conf_dir, 'glance-manage.conf')
with open(conf_filepath, 'w') as conf_file: with open(conf_filepath, 'w') as conf_file:
conf_file.write('[DEFAULT]\n') conf_file.write('[database]\n')
conf_file.write('sql_connection = %s' % self.sql_connection) conf_file.write('connection = %s' % self.sql_connection)
conf_file.flush() conf_file.flush()
glance_db_env = 'GLANCE_DB_TEST_SQLITE_FILE' glance_db_env = 'GLANCE_DB_TEST_SQLITE_FILE'
@ -440,7 +440,6 @@ scrub_time = %(scrub_time)s
send_identity_headers = %(send_identity_headers)s send_identity_headers = %(send_identity_headers)s
image_cache_dir = %(image_cache_dir)s image_cache_dir = %(image_cache_dir)s
image_cache_driver = %(image_cache_driver)s image_cache_driver = %(image_cache_driver)s
sql_connection = %(sql_connection)s
show_image_direct_url = %(show_image_direct_url)s show_image_direct_url = %(show_image_direct_url)s
show_multiple_locations = %(show_multiple_locations)s show_multiple_locations = %(show_multiple_locations)s
user_storage_quota = %(user_storage_quota)s user_storage_quota = %(user_storage_quota)s
@ -454,6 +453,8 @@ image_location_quota=%(image_location_quota)s
location_strategy=%(location_strategy)s location_strategy=%(location_strategy)s
allow_additional_image_properties = True allow_additional_image_properties = True
node_staging_uri=%(node_staging_uri)s node_staging_uri=%(node_staging_uri)s
[database]
connection = %(sql_connection)s
[oslo_policy] [oslo_policy]
policy_file = %(policy_file)s policy_file = %(policy_file)s
policy_default_rule = %(policy_default_rule)s policy_default_rule = %(policy_default_rule)s
@ -630,7 +631,6 @@ scrub_time = %(scrub_time)s
send_identity_headers = %(send_identity_headers)s send_identity_headers = %(send_identity_headers)s
image_cache_dir = %(image_cache_dir)s image_cache_dir = %(image_cache_dir)s
image_cache_driver = %(image_cache_driver)s image_cache_driver = %(image_cache_driver)s
sql_connection = %(sql_connection)s
show_image_direct_url = %(show_image_direct_url)s show_image_direct_url = %(show_image_direct_url)s
show_multiple_locations = %(show_multiple_locations)s show_multiple_locations = %(show_multiple_locations)s
user_storage_quota = %(user_storage_quota)s user_storage_quota = %(user_storage_quota)s
@ -644,6 +644,8 @@ image_location_quota=%(image_location_quota)s
location_strategy=%(location_strategy)s location_strategy=%(location_strategy)s
allow_additional_image_properties = True allow_additional_image_properties = True
enabled_backends=file1:file,file2:file,file3:file enabled_backends=file1:file,file2:file,file3:file
[database]
connection = %(sql_connection)s
[oslo_policy] [oslo_policy]
policy_file = %(policy_file)s policy_file = %(policy_file)s
policy_default_rule = %(policy_default_rule)s policy_default_rule = %(policy_default_rule)s
@ -795,8 +797,9 @@ wakeup_time = 2
scrub_time = %(scrub_time)s scrub_time = %(scrub_time)s
metadata_encryption_key = %(metadata_encryption_key)s metadata_encryption_key = %(metadata_encryption_key)s
lock_path = %(lock_path)s lock_path = %(lock_path)s
sql_connection = %(sql_connection)s
sql_idle_timeout = 3600 sql_idle_timeout = 3600
[database]
connection = %(sql_connection)s
[glance_store] [glance_store]
filesystem_store_datadir=%(image_dir)s filesystem_store_datadir=%(image_dir)s
[oslo_policy] [oslo_policy]

3
glance/tests/functional/serial/test_scrubber.py
View File

@ -40,7 +40,8 @@ class TestScrubber(functional.FunctionalTest):
self.api_server.deployment_flavor = 'noauth' self.api_server.deployment_flavor = 'noauth'
self.api_server.send_identity_credentials = True self.api_server.send_identity_credentials = True
self.admin_context = context.get_admin_context(show_deleted=True) self.admin_context = context.get_admin_context(show_deleted=True)
CONF.set_override('sql_connection', self.api_server.sql_connection) CONF.set_override('connection', self.api_server.sql_connection,
group='database')
def _headers(self, custom_headers=None): def _headers(self, custom_headers=None):
base_headers = { base_headers = {