openstack/cinder
Code Issues Proposed changes

Merge "fix default config option types"

Browse Source
This commit is contained in:
Jenkins 2013-04-11 04:55:56 +00:00 committed by Gerrit Code Review
commit 2b9218c42c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/openstack/common/rpc/matchmaker.py
View File

@ -35,10 +35,10 @@ matchmaker_opts = [
default='/etc/nova/matchmaker_ring.json', default='/etc/nova/matchmaker_ring.json',
help='Matchmaker ring file (JSON)'), help='Matchmaker ring file (JSON)'),
cfg.IntOpt('matchmaker_heartbeat_freq', cfg.IntOpt('matchmaker_heartbeat_freq',
default='300', default=300,
help='Heartbeat frequency'), help='Heartbeat frequency'),
cfg.IntOpt('matchmaker_heartbeat_ttl', cfg.IntOpt('matchmaker_heartbeat_ttl',
default='600', default=600,
help='Heartbeat time-to-live.'), help='Heartbeat time-to-live.'),
] ]

5
cinder/volume/drivers/coraid.py
View File

@ -47,8 +47,9 @@ coraid_opts = [
default='admin', default='admin',
help='User name to connect to Coraid ESM'), help='User name to connect to Coraid ESM'),
cfg.StrOpt('coraid_group', cfg.StrOpt('coraid_group',
default=False, default='admin',
help='Group name of coraid_user (must have admin privilege)'), help='Name of group on Coraid ESM to which coraid_user belongs'
' (must have admin privilege)'),
cfg.StrOpt('coraid_password', cfg.StrOpt('coraid_password',
default='password', default='password',
help='Password to connect to Coraid ESM'), help='Password to connect to Coraid ESM'),