openstack/trove
Code Issues Proposed changes

Set sane defaults for required conf params in trove/common/cfg.py

Browse Source 
The following conf options are required and should have their defaults
set to sane values which make sense for the reference implementation:
ignore_dbs, ignore_users, admin_roles, and api_extensions_path

Change-Id: I2d78e9a06cb56832297d38a8fc4608964bca6976
Fixes: bug 1226496
This commit is contained in:
Nikhil Manchanda 2013-09-17 02:29:15 -07:00
parent 10ce3a6930
commit 5da9c62b91
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/trove/trove-guestagent.conf.sample
View File

@ -64,6 +64,10 @@ rabbit_host=10.0.0.1
log_dir = /tmp/ log_dir = /tmp/
log_file = logfile.txt log_file = logfile.txt
# Users to ignore for user create/list/delete operations
ignore_users = os_admin
ignore_dbs = lost+found, mysql, information_schema
# Strategy information for backups # Strategy information for backups
backup_strategy = InnoBackupEx backup_strategy = InnoBackupEx
backup_namespace = trove.guestagent.strategies.backup.impl backup_namespace = trove.guestagent.strategies.backup.impl

10
trove/common/cfg.py
View File

@ -34,7 +34,7 @@ common_opts = [
cfg.IntOpt('sql_idle_timeout', default=3600), cfg.IntOpt('sql_idle_timeout', default=3600),
cfg.BoolOpt('sql_query_log', default=False), cfg.BoolOpt('sql_query_log', default=False),
cfg.IntOpt('bind_port', default=8779), cfg.IntOpt('bind_port', default=8779),
cfg.StrOpt('api_extensions_path', default='', cfg.StrOpt('api_extensions_path', default='trove/extensions/routes',
help='Path to extensions'), help='Path to extensions'),
cfg.StrOpt('api_paste_config', cfg.StrOpt('api_paste_config',
default="api-paste.ini", default="api-paste.ini",
@ -45,7 +45,7 @@ common_opts = [
cfg.BoolOpt('trove_volume_support', cfg.BoolOpt('trove_volume_support',
default=True, default=True,
help='File name for the paste.deploy config for trove-api'), help='File name for the paste.deploy config for trove-api'),
cfg.ListOpt('admin_roles', default=[]), cfg.ListOpt('admin_roles', default=['admin']),
cfg.StrOpt('remote_implementation', cfg.StrOpt('remote_implementation',
default="real", default="real",
help='Remote implementation for using fake integration code'), help='Remote implementation for using fake integration code'),
@ -77,8 +77,10 @@ common_opts = [
cfg.IntOpt('users_page_size', default=20), cfg.IntOpt('users_page_size', default=20),
cfg.IntOpt('databases_page_size', default=20), cfg.IntOpt('databases_page_size', default=20),
cfg.IntOpt('instances_page_size', default=20), cfg.IntOpt('instances_page_size', default=20),
cfg.ListOpt('ignore_users', default=[]), cfg.ListOpt('ignore_users', default=['os_admin', 'root']),
cfg.ListOpt('ignore_dbs', default=[]), cfg.ListOpt('ignore_dbs', default=['lost+found',
'mysql',
'information_schema']),
cfg.IntOpt('agent_call_low_timeout', default=5), cfg.IntOpt('agent_call_low_timeout', default=5),
cfg.IntOpt('agent_call_high_timeout', default=60), cfg.IntOpt('agent_call_high_timeout', default=60),
cfg.StrOpt('guest_id', default=None), cfg.StrOpt('guest_id', default=None),

2
trove/guestagent/manager/mysql_service.py
View File

@ -891,7 +891,7 @@ class MySqlRootAccess(object):
@classmethod @classmethod
def enable_root(cls): def enable_root(cls):
"""Enable the root user global access and/or reset the root password""" """Enable the root user global access and/or reset the root password"""
user = models.MySQLUser() user = models.RootUser()
user.name = "root" user.name = "root"
user.host = "%" user.host = "%"
user.password = generate_random_password() user.password = generate_random_password()