diff options
| author | Amrith Kumar <amrith@tesora.com> | 2015-09-14 18:32:48 +0000 |
|---|---|---|
| committer | Amrith Kumar <amrith@tesora.com> | 2015-11-09 15:58:21 -0500 |
| commit | 9f07d7da8dcb0c9162be479a6587f352c37f9024 (patch) | |
| tree | d741bfce2d50e9fadb810a52be4d9ac3e737256c /etc | |
| parent | 709a33f8be3ee23ceabbe84f67f362c1a1515426 (diff) | |
| download | trove-9f07d7da8dcb0c9162be479a6587f352c37f9024.tar.gz | |
Move ignore_dbs and ignore_users out of DEFAULT
ignore_dbs and ignore_users (for MySQL) were still in DEFAULT section
of config. Moved them to the 'mysql' section and 'percona'
section. Sample config file(s) have been updated as well.
Change-Id: I3a41bcb011a76343afa3bcc30013cb835e456950
Closes-Bug: #1465242
Closes-Bug: #1480448
Closes-Bug: #1480447
Closes-Bug: #1374004
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/trove/trove-guestagent.conf.sample | 12 | ||||
| -rw-r--r-- | etc/trove/trove.conf.sample | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/etc/trove/trove-guestagent.conf.sample b/etc/trove/trove-guestagent.conf.sample index babf7ee5..09f89d2a 100644 --- a/etc/trove/trove-guestagent.conf.sample +++ b/etc/trove/trove-guestagent.conf.sample @@ -64,12 +64,6 @@ rabbit_password=f7999d1955c5014aa32c # ========== Default Users / DBs Configuration ========== -# Users to ignore for user create/list/delete operations -ignore_users = os_admin - -# Databases to ignore for db create/list/delete operations -ignore_dbs = lost+found, mysql, information_schema - # Permissions to grant "root" user by default root_grant = ALL root_grant_option = True @@ -132,6 +126,12 @@ log_file = logfile.txt # replication_user = slave_user # replication_password = slave_password +# Users to ignore for user create/list/delete operations +# ignore_users = os_admin + +# Databases to ignore for db create/list/delete operations +# ignore_dbs = mysql, information_schema, performance_schema + [vertica] # For vertica, following are the defaults needed: # mount_point = /var/lib/vertica diff --git a/etc/trove/trove.conf.sample b/etc/trove/trove.conf.sample index bb824fc5..c4835e4a 100644 --- a/etc/trove/trove.conf.sample +++ b/etc/trove/trove.conf.sample @@ -142,10 +142,6 @@ taskmanager_queue = taskmanager # Auth admin_roles = admin -# Users to ignore for user create/list/delete operations -ignore_users = os_admin, root -ignore_dbs = lost+found, mysql, information_schema - # Guest related conf agent_heartbeat_time = 10 agent_call_low_timeout = 5 @@ -219,6 +215,11 @@ tcp_ports = 3306 volume_support = True device_path = /dev/vdb +# Users to ignore for user create/list/delete operations +ignore_users = os_admin, root +ignore_dbs = mysql, information_schema, performance_schema + + [redis] tcp_ports = 6379 #redis uses local storage |