Merge "fix default config option types"

cinder/openstack/common/rpc/matchmaker.py

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

cinder/volume/drivers/coraid.py

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