diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-30 06:22:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-30 06:22:22 +0000 |
| commit | d91686ace3ae1bf22948b9a0a4bf62918585a029 (patch) | |
| tree | 009acca3c72719950352b5a1fd9473d5291b333e | |
| parent | c76ee403f2cb0e24a0242e4490251f93865e7ca3 (diff) | |
| parent | 50bd3e5416665c68cf8d562318ce0b9238ce099f (diff) | |
| download | nova-d91686ace3ae1bf22948b9a0a4bf62918585a029.tar.gz | |
Merge "Sync in matchmaker and qpid Conf changes from oslo" into milestone-proposed2013.1.rc22013.1
| -rw-r--r-- | nova/openstack/common/rpc/impl_qpid.py | 4 | ||||
| -rw-r--r-- | nova/openstack/common/rpc/matchmaker.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/openstack/common/rpc/impl_qpid.py b/nova/openstack/common/rpc/impl_qpid.py index fd4b25e7f1..d3cc12d3c1 100644 --- a/nova/openstack/common/rpc/impl_qpid.py +++ b/nova/openstack/common/rpc/impl_qpid.py @@ -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'], diff --git a/nova/openstack/common/rpc/matchmaker.py b/nova/openstack/common/rpc/matchmaker.py index e4862396a8..dcee752b23 100644 --- a/nova/openstack/common/rpc/matchmaker.py +++ b/nova/openstack/common/rpc/matchmaker.py @@ -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.'), ] |