openstack
/
nova
Code Issues Proposed changes

Sync in matchmaker and qpid Conf changes from oslo 

The following should use integers not strings.
* matchmaker_heartbeat_freq
* matchmaker_heartbeat_ttl
* qpid_port

Fixes bug 1159889 and bug 1161679

Change-Id: I2f055929ffa48ead300d2a3efdb0ce0692a13716
(cherry picked from commit 94783b2158)
This commit is contained in:
Joe Gordon 2013-03-29 14:45:23 -07:00
parent f7d8952994
commit 50bd3e5416
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/openstack/common/rpc/impl_qpid.py
View File

@ -40,8 +40,8 @@ qpid_opts = [
cfg.StrOpt('qpid_hostname',
default='localhost',
help='Qpid broker hostname'),
cfg.StrOpt('qpid_port',
default='5672',
cfg.IntOpt('qpid_port',
default=5672,
help='Qpid broker port'),
cfg.ListOpt('qpid_hosts',
default=['$qpid_hostname:$qpid_port'],

4
nova/openstack/common/rpc/matchmaker.py
View File

@ -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.'),
]