openstack/glance
Code Issues Proposed changes

Merge "Removed obsolete db_auto_create configuration option"

Browse Source
This commit is contained in:
Jenkins
2015-01-06 04:58:02 +00:00
committed by Gerrit Code Review
parent 0f1ff62564 a4d50b01a0
commit 9e55118515
5 changed files with 2 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
doc/source/configuring.rst
View File

@@ -183,13 +183,6 @@ will prevent any new processes from being created.
Optional. Default: The number of CPUs available will be used by default. Optional. Default: The number of CPUs available will be used by default.
* ``db_auto_create=False``
Whether to automatically create the database tables. Otherwise you can
manually run `glance-manage db sync`.
Optional. Default: ``False``
Configuring SSL Support Configuring SSL Support
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~

4
etc/glance-api.conf
View File

@@ -170,10 +170,6 @@ registry_client_protocol = http
# Default: 600 # Default: 600
#registry_client_timeout = 600 #registry_client_timeout = 600
# Whether to automatically create the database tables.
# Default: False
#db_auto_create = False
# Enable DEBUG log messages from sqlalchemy which prints every database # Enable DEBUG log messages from sqlalchemy which prints every database
# query and response. # query and response.
# Default: False # Default: False

4
etc/glance-registry.conf
View File

@@ -49,10 +49,6 @@ limit_param_default = 25
# Role used to identify an authenticated user as administrator # Role used to identify an authenticated user as administrator
#admin_role = admin #admin_role = admin
# Whether to automatically create the database tables.
# Default: False
#db_auto_create = False
# Enable DEBUG log messages from sqlalchemy which prints every database # Enable DEBUG log messages from sqlalchemy which prints every database
# query and response. # query and response.
# Default: False # Default: False

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

@@ -330,7 +330,6 @@ image_cache_dir = %(image_cache_dir)s
image_cache_driver = %(image_cache_driver)s image_cache_driver = %(image_cache_driver)s
policy_file = %(policy_file)s policy_file = %(policy_file)s
policy_default_rule = %(policy_default_rule)s policy_default_rule = %(policy_default_rule)s
db_auto_create = False
data_api = %(data_api)s data_api = %(data_api)s
sql_connection = %(sql_connection)s sql_connection = %(sql_connection)s
show_image_direct_url = %(show_image_direct_url)s show_image_direct_url = %(show_image_direct_url)s
@@ -448,7 +447,6 @@ debug = %(debug)s
bind_host = 127.0.0.1 bind_host = 127.0.0.1
bind_port = %(bind_port)s bind_port = %(bind_port)s
log_file = %(log_file)s log_file = %(log_file)s
db_auto_create = False
sql_connection = %(sql_connection)s sql_connection = %(sql_connection)s
sql_idle_timeout = 3600 sql_idle_timeout = 3600
api_limit_max = 1000 api_limit_max = 1000

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

@@ -37,10 +37,9 @@ class TestGlanceManage(functional.FunctionalTest):
self.connection = ('sql_connection = sqlite:///%s' % self.connection = ('sql_connection = sqlite:///%s' %
self.db_filepath) self.db_filepath)
def _sync_db(self, auto_create): def _sync_db(self):
with open(self.conf_filepath, 'wb') as conf_file: with open(self.conf_filepath, 'wb') as conf_file:
conf_file.write('[DEFAULT]\n') conf_file.write('[DEFAULT]\n')
conf_file.write('db_auto_create = %r\n' % auto_create)
conf_file.write(self.connection) conf_file.write(self.connection)
conf_file.flush() conf_file.flush()
@@ -70,14 +69,6 @@ class TestGlanceManage(functional.FunctionalTest):
@skip_if_disabled @skip_if_disabled
def test_db_creation(self): def test_db_creation(self):
"""Test DB creation by db_sync on a fresh DB""" """Test DB creation by db_sync on a fresh DB"""
self._sync_db(True) self._sync_db()
self._assert_tables()
@depends_on_exe('sqlite3')
@skip_if_disabled
def test_db_creation_auto_create_overridden(self):
"""Test DB creation with db_auto_create False"""
self._sync_db(False)
self._assert_tables() self._assert_tables()