From 4f0023d5a21f00536b2a2e6097ab9a07b6c13d1a Mon Sep 17 00:00:00 2001 From: Martin Millnert Date: Tue, 5 Jan 2016 18:14:23 +0100 Subject: [PATCH] disc_server.py: remove hardcoded IP-address src/discovery/disc_server.py has a hardcoded IP address (127.0.0.1) in its "connect-to-self" code. The Discovery Server can bind to a configurable port number, so this is simply a forgotten variable. Without this change, it is impossible to operate a Discovery Server that has bound to another IP address than 127.0.0.1. The default value in self._args.listen_ip_addr is populated by the parameter "_WEB_HOST" in src/discovery/disc_consts.py:5. The default value of this parameter is '127.0.0.1'. The change has therefore no impact on a Discovery Server with standard configuration. Change-Id: Ibd6a7ddd31a462f240c2358d657e5d384a5bd3ed Closes-Bug: #1531214 Signed-off-by: Martin Millnert (cherry picked from commit 7924b210aca98d77a82f1ac7a58ffc9a7395718a) --- src/discovery/disc_server.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/discovery/disc_server.py b/src/discovery/disc_server.py index 149b8e5c5df..9147744c5c3 100644 --- a/src/discovery/disc_server.py +++ b/src/discovery/disc_server.py @@ -182,7 +182,7 @@ def __init__(self, args): node_type_name = NodeTypeNames[node_type] instance_id = self._args.worker_id disc_client = discovery_client.DiscoveryClient( - '127.0.0.1', self._args.listen_port, + self._args.listen_ip_addr, self._args.listen_port, ModuleNames[Module.DISCOVERY_SERVICE]) self._sandesh.init_generator( module_name, socket.gethostname(), node_type_name, instance_id,