fix default config option types

Change-Id: I4bea0b5e12d229b0d9188e10c70996a5606aa970
Fixes: bug #1167318

diff --git a/cinder/openstack/common/rpc/matchmaker.py b/cinder/openstack/common/rpc/matchmaker.py
index 8800cb427c76fffa224437554c90bb086654747d..f12c14dfd14e30d10cdf2738a61a077bb34fc002 100644 (file)
--- a/cinder/openstack/common/rpc/matchmaker.py
+++ b/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.'),
 ]
 

diff --git a/cinder/volume/drivers/coraid.py b/cinder/volume/drivers/coraid.py
index 3c0616b8364b105e7a018831e831c959042947a8..ca7d674f8e629da6e9b1f42be207737ebbb9c8ae 100644 (file)
--- a/cinder/volume/drivers/coraid.py
+++ b/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'),