openstack/trove
Code Issues Proposed changes

Adds root to the ignore_users list and forces user list to obey it.

Browse Source
This commit is contained in:
Ed Cranford
2012-07-26 13:10:40 -05:00
parent 42ee7e7533
commit 16c84902c9
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
etc/reddwarf/reddwarf.conf.sample
View File

@@ -63,7 +63,7 @@ taskmanager_queue = taskmanager
admin_roles = admin
# Users to ignore for user create/list/delete operations
ignore_users = os_admin
ignore_users = os_admin, root
# Guest related conf
agent_heartbeat_time = 10

2
etc/reddwarf/reddwarf.conf.test
View File

@@ -69,7 +69,7 @@ volume_time_out=30
admin_roles = admin
# Users to ignore for user create/list/delete operations
ignore_users = os_admin
ignore_users = os_admin, root
# Guest related conf
agent_heartbeat_time = 10

7
reddwarf/extensions/mysql/models.py
View File

@@ -150,7 +150,7 @@ def load_via_context(cls, context, instance_id):
class Users(object):
DEFAULT_LIMIT = int(config.Config.get('users_page_size', '20'))
DEFAULT_LIMIT = int(CONFIG.get('users_page_size', '20'))
@classmethod
def load(cls, context, instance_id):
@@ -161,9 +161,12 @@ class Users(object):
user_list, next_marker = client.list_users(limit=limit,
marker=marker, include_marker=include_marker)
model_users = []
ignore_users = CONFIG.get_list('ignore_users', [])
for user in user_list:
mysql_user = guest_models.MySQLUser()
mysql_user.deserialize(user)
if mysql_user.name in ignore_users:
continue
# TODO(hub-cap): databases are not being returned in the
# reference agent
dbs = []
@@ -205,7 +208,7 @@ class Schema(object):
class Schemas(object):
DEFAULT_LIMIT = int(config.Config.get('databases_page_size', '20'))
DEFAULT_LIMIT = int(CONFIG.get('databases_page_size', '20'))
@classmethod
def load(cls, context, instance_id):