From 56a49adc13cdbc5e2e6a4787cd9c7eb7a72cceb5 Mon Sep 17 00:00:00 2001
From: Darren Birkett <darren.birkett@gmail.com>
Date: Wed, 10 Apr 2013 13:34:01 +0100
Subject: [PATCH] fix default config option types

Change-Id: I4bea0b5e12d229b0d9188e10c70996a5606aa970
Fixes: bug #1167318
---
 cinder/openstack/common/rpc/matchmaker.py | 4 ++--
 cinder/volume/drivers/coraid.py           | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/cinder/openstack/common/rpc/matchmaker.py b/cinder/openstack/common/rpc/matchmaker.py
index 8800cb427..f12c14dfd 100644
--- 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 3c0616b83..ca7d674f8 100644
--- 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'),
-- 
2.45.2