diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-05-08 15:20:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-05-08 15:20:24 +0000 |
| commit | e5844565440701a810047343d994ff48fc9e0e39 (patch) | |
| tree | 03e742a28cdcf79db3c9647b478c9424926a498b | |
| parent | faa98823951fb390559adde538c15bd830056655 (diff) | |
| parent | 61a515a5a7feeeacd17821456459eb4cc828c695 (diff) | |
Merge "httplib throw "TypeError: an integer is required" when run quantum"
| -rw-r--r-- | Authors | 1 | ||||
| -rw-r--r-- | etc/nova/nova.conf.sample | 2 | ||||
| -rw-r--r-- | nova/network/quantum/quantum_connection.py | 4 |
3 files changed, 4 insertions, 3 deletions
@@ -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 9bc4ac4ba..027472310 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 389fd2f70..97426f399 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", |