openstack
/
designate
Code Issues Proposed changes

Merge "Fix _get_listen_on_addresses to handle port 0"

This commit is contained in:
Jenkins 2016-05-09 13:04:39 +00:00 committed by Gerrit Code Review
parent d205737aa0 40b1ad5692
commit c76dd0e40b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
designate/service.py
View File

@ -112,12 +112,13 @@ class Service(service.Service):
host = self._service_config.host
port = self._service_config.port
if host or port:
if host or port is not None:
LOG.warning(_LW("host and port config options used, the 'listen' "
"option has been ignored"))
host = host or "0.0.0.0"
port = port or default_port
# "port" might be 0 to pick a free port, usually during testing
port = default_port if port is None else port
return [(host, port)]