summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-03-26 00:38:18 +0000
committerGerrit Code Review <review@openstack.org>2013-03-26 00:38:18 +0000
commit4d1a4f28dca5e115c467cd3bd792121317427d56 (patch)
treea1519b1f8f5f4ee5c985adc6d95879836554d9d8 /openstack
parent9366a05b8dd12981810970b86c93e2089a5bf8cb (diff)
parent5c825e4ddcf0aa980ec61c0e420328169b5a9ed6 (diff)
downloadoslo-4d1a4f28dca5e115c467cd3bd792121317427d56.tar.gz
oslo-4d1a4f28dca5e115c467cd3bd792121317427d56.tar.xz
oslo-4d1a4f28dca5e115c467cd3bd792121317427d56.zip
Merge "Fix default values for Matchmaker IntOpts"
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/rpc/matchmaker.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/rpc/matchmaker.py b/openstack/common/rpc/matchmaker.py
index 2ff5ecc..7366246 100644
--- a/openstack/common/rpc/matchmaker.py
+++ b/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.'),
]