diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-25 18:37:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-25 18:37:56 +0000 |
| commit | 63f216755a61f76452d900264948d55ce94b75a4 (patch) | |
| tree | 744dd67ffcdd919932391823d2d0b88c68255063 | |
| parent | 89435416a1dcb6df2a347f43680cfe57d1eb0a82 (diff) | |
| parent | 833f9c873d538037d6036624d19e5cba332cf54a (diff) | |
| download | designate-63f216755a61f76452d900264948d55ce94b75a4.tar.gz | |
Merge "Adjusted default heartbeat interval and renamed file"9.0.0.0rc19.0.0
| -rw-r--r-- | designate/conf/__init__.py | 4 | ||||
| -rw-r--r-- | designate/conf/heartbeat_emitter.py (renamed from designate/conf/service_status.py) | 2 | ||||
| -rw-r--r-- | designate/tests/unit/test_service_status.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/designate/conf/__init__.py b/designate/conf/__init__.py index 508d60b7..9abbf6a7 100644 --- a/designate/conf/__init__.py +++ b/designate/conf/__init__.py @@ -24,6 +24,7 @@ from designate.conf import denominator from designate.conf import djbdns from designate.conf import dynect from designate.conf import gdnsd +from designate.conf import heartbeat_emitter from designate.conf import infoblox from designate.conf import keystone from designate.conf import knot2 @@ -33,7 +34,6 @@ from designate.conf import msdns from designate.conf import network_api from designate.conf import producer from designate.conf import proxy -from designate.conf import service_status from designate.conf import sink from designate.conf import storage from designate.conf import worker @@ -51,6 +51,7 @@ denominator.register_opts(CONF) djbdns.register_opts(CONF) dynect.register_opts(CONF) gdnsd.register_opts(CONF) +heartbeat_emitter.register_opts(CONF) infoblox.register_opts(CONF) keystone.register_opts(CONF) knot2.register_opts(CONF) @@ -60,7 +61,6 @@ msdns.register_opts(CONF) network_api.register_opts(CONF) producer.register_opts(CONF) proxy.register_opts(CONF) -service_status.register_opts(CONF) sink.register_opts(CONF) storage.register_opts(CONF) worker.register_opts(CONF) diff --git a/designate/conf/service_status.py b/designate/conf/heartbeat_emitter.py index d43afec6..1d9f4e57 100644 --- a/designate/conf/service_status.py +++ b/designate/conf/heartbeat_emitter.py @@ -20,7 +20,7 @@ HEARTBEAT_GROUP = cfg.OptGroup( HEARTBEAT_OPTS = [ cfg.FloatOpt('heartbeat_interval', - default=5.0, + default=10.0, help='Number of seconds between heartbeats for reporting ' 'state'), cfg.StrOpt('emitter_type', default="rpc", help="Emitter to use"), diff --git a/designate/tests/unit/test_service_status.py b/designate/tests/unit/test_service_status.py index 6ad43942..a8fe3880 100644 --- a/designate/tests/unit/test_service_status.py +++ b/designate/tests/unit/test_service_status.py @@ -32,7 +32,7 @@ class NoopEmitterTest(oslotest.base.BaseTestCase): emitter.start() self.mock_tg.add_timer.assert_called_once_with( - 5.0, emitter._emit_heartbeat) + 10.0, emitter._emit_heartbeat) def test_stop(self): mock_pulse = mock.Mock() |