From dc9c3cb3e376e6af263e4ffae88471317f830e0a Mon Sep 17 00:00:00 2001
From: Zhongyue Luo <lzyeval@gmail.com>
Date: Wed, 16 May 2012 06:01:43 +0000
Subject: Misused and not used config options

Fixes bug #1000071

[nova.flag.py]
stub_network: StrOpt -> BoolOpt

[nova.api.sizelimit.py]
osapi_max_request_body_size: BoolOpt -> IntOpt

[nova.compute.api.py]
find_host_timeout: not used

[nova.rpc.__init__.py]
allowed_rpc_exception_modules: IntOpt -> ListOpt

[nova.virt.vmwareapi_conn.py]
vmwareapi_api_retry_count: FloatOpt -> IntOpt

[nova.volume.driver.py]
num_shell_tries: StrOpt -> IntOpt
num_iscsi_scan_tries: StrOpt -> IntOpt

[nova.volume.driver.py]
san_thin_provision: 'true' -> True
san_is_local: 'false' -> False

Change-Id: I07ab60b1d881c9475f4f2517a432f1e934d8ae52
---
 nova/volume/driver.py | 4 ++--
 nova/volume/san.py    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/volume')

diff --git a/nova/volume/driver.py b/nova/volume/driver.py
index add975600..79ca3cab6 100644
--- a/nova/volume/driver.py
+++ b/nova/volume/driver.py
@@ -36,10 +36,10 @@ volume_opts = [
     cfg.StrOpt('volume_group',
                default='nova-volumes',
                help='Name for the VG that will contain exported volumes'),
-    cfg.StrOpt('num_shell_tries',
+    cfg.IntOpt('num_shell_tries',
                default=3,
                help='number of times to attempt to run flakey shell commands'),
-    cfg.StrOpt('num_iscsi_scan_tries',
+    cfg.IntOpt('num_iscsi_scan_tries',
                default=3,
                help='number of times to rescan iSCSI target to find volume'),
     cfg.IntOpt('iscsi_num_targets',
diff --git a/nova/volume/san.py b/nova/volume/san.py
index e43a64a59..de30a36af 100644
--- a/nova/volume/san.py
+++ b/nova/volume/san.py
@@ -45,7 +45,7 @@ LOG = logging.getLogger(__name__)
 
 san_opts = [
     cfg.BoolOpt('san_thin_provision',
-                default='true',
+                default=True,
                 help='Use thin provisioning for SAN volumes?'),
     cfg.StrOpt('san_ip',
                default='',
@@ -66,7 +66,7 @@ san_opts = [
                default=22,
                help='SSH port to use with SAN'),
     cfg.BoolOpt('san_is_local',
-                default='false',
+                default=False,
                 help='Execute commands locally instead of over SSH; '
                      'use if the volume service is running on the SAN device'),
     cfg.StrOpt('san_zfs_volume_base',
-- 
cgit