diff --git a/Authors b/Authors
index e5d250a9dece..3818e4f57c51 100644
--- a/Authors
+++ b/Authors
@@ -74,6 +74,7 @@ Greg Althaus <galthaus@austin.rr.com>
 Hengqing Hu <hudayou@hotmail.com>
 Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
 Hisaki Ohara <hisaki.ohara@intel.com>
+Hua Zhang <zhhuabj@cn.ibm.com>
 Ilya Alekseyev <ilyaalekseyev@acm.org>
 Ionuț Arțăriși <iartarisi@suse.cz>
 Isaku Yamahata <yamahata@valinux.co.jp>
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample
index 9bc4ac4bac3b..02747231034d 100644
--- a/etc/nova/nova.conf.sample
+++ b/etc/nova/nova.conf.sample
@@ -614,7 +614,7 @@
 ###### (StrOpt) HOST for connecting to quantum
 # quantum_connection_host="127.0.0.1"
 ###### (StrOpt) PORT for connecting to quantum
-# quantum_connection_port="9696"
+# quantum_connection_port=9696
 ###### (StrOpt) Default tenant id when creating quantum networks
 # quantum_default_tenant_id="default"
 ###### (StrOpt) Indicates underlying IP address management library
diff --git a/nova/network/quantum/quantum_connection.py b/nova/network/quantum/quantum_connection.py
index 389fd2f702d6..97426f399056 100644
--- a/nova/network/quantum/quantum_connection.py
+++ b/nova/network/quantum/quantum_connection.py
@@ -27,8 +27,8 @@ quantum_opts = [
     cfg.StrOpt('quantum_connection_host',
                default='127.0.0.1',
                help='HOST for connecting to quantum'),
-    cfg.StrOpt('quantum_connection_port',
-               default='9696',
+    cfg.IntOpt('quantum_connection_port',
+               default=9696,
                help='PORT for connecting to quantum'),
     cfg.StrOpt('quantum_default_tenant_id',
                default="default",