diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-30 06:22:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-30 06:22:06 +0000 |
| commit | a831e9d2608aa9fd6200ea873e3cb766322a6c3c (patch) | |
| tree | 03c3bd45e378d5108ad7250d97ca90514b231f9b /nova/openstack | |
| parent | faf24498fc1f09ef2e975709482ad9985f18e913 (diff) | |
| parent | 94783b2158e9b92d40974b9bb0738426e2162066 (diff) | |
| download | nova-a831e9d2608aa9fd6200ea873e3cb766322a6c3c.tar.gz nova-a831e9d2608aa9fd6200ea873e3cb766322a6c3c.tar.xz nova-a831e9d2608aa9fd6200ea873e3cb766322a6c3c.zip | |
Merge "Sync in matchmaker and qpid Conf changes from oslo"
Diffstat (limited to 'nova/openstack')
| -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 fd4b25e7f..d3cc12d3c 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 e4862396a..dcee752b2 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.'), ] |