openstack
/
nova
Code Issues Proposed changes

Merge "httplib throw "TypeError: an integer is required" when run quantum"

This commit is contained in:
Jenkins 2012-05-08 15:20:24 +00:00 committed by Gerrit Code Review
parent faa9882395 61a515a5a7
commit e584456544
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@ -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>

2
etc/nova/nova.conf.sample
View File

@ -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

4
nova/network/quantum/quantum_connection.py
View File

@ -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",