Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use HostAddressOpt for opts that accept IP and hostnames"

Browse Source
This commit is contained in:
Jenkins
2017-03-29 12:05:34 +00:00
committed by Gerrit Code Review
parent d53abb7af5 4d3727eafb
commit 49924e1915
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
watcher/conf/api.py
View File

@@ -32,9 +32,10 @@ API_SERVICE_OPTS = [
cfg.PortOpt('port', cfg.PortOpt('port',
default=9322, default=9322,
help='The port for the watcher API server'), help='The port for the watcher API server'),
cfg.StrOpt('host', cfg.HostAddressOpt('host',
default='127.0.0.1', default='127.0.0.1',
help='The listen IP address for the watcher API server'), help='The listen IP address for the watcher API server'
),
cfg.IntOpt('max_limit', cfg.IntOpt('max_limit',
default=1000, default=1000,
help='The maximum number of items returned in a single ' help='The maximum number of items returned in a single '

15
watcher/conf/service.py
View File

@@ -26,13 +26,14 @@ SERVICE_OPTS = [
cfg.IntOpt('periodic_interval', cfg.IntOpt('periodic_interval',
default=60, default=60,
help=_('Seconds between running periodic tasks.')), help=_('Seconds between running periodic tasks.')),
cfg.StrOpt('host', cfg.HostAddressOpt('host',
default=socket.gethostname(), default=socket.gethostname(),
help=_('Name of this node. This can be an opaque identifier. ' help=_('Name of this node. This can be an opaque '
'It is not necessarily a hostname, FQDN, or IP address. ' 'identifier. It is not necessarily a hostname, '
'However, the node name must be valid within ' 'FQDN, or IP address. However, the node name '
'an AMQP key, and if using ZeroMQ, a valid ' 'must be valid within an AMQP key, and if using '
'hostname, FQDN, or IP address.')), 'ZeroMQ, a valid hostname, FQDN, or IP address.')
),
cfg.IntOpt('service_down_time', cfg.IntOpt('service_down_time',
default=90, default=90,
help=_('Maximum time since last check-in for up service.')) help=_('Maximum time since last check-in for up service.'))