Browse Source

Use getfqdn instead of gethostname

We need routable addresses for streaming, so make sure we use the
fqdn.

Change-Id: I43cca352eb123bb484e3d51aa242ba4258c1d51e
changes/23/540623/1
James E. Blair 3 years ago
parent
commit
ce1bf1f34f
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      zuul/executor/server.py
  2. +1
    -1
      zuul/scheduler.py

+ 1
- 1
zuul/executor/server.py View File

@ -1600,7 +1600,7 @@ class ExecutorServer(object):
# TODOv3(mordred): make the executor name more unique --
# perhaps hostname+pid.
self.hostname = get_default(self.config, 'executor', 'hostname',
socket.gethostname())
socket.getfqdn())
self.log_streaming_port = log_streaming_port
self.merger_lock = threading.Lock()
self.governor_lock = threading.Lock()


+ 1
- 1
zuul/scheduler.py View File

@ -214,7 +214,7 @@ class Scheduler(threading.Thread):
def __init__(self, config, testonly=False):
threading.Thread.__init__(self)
self.daemon = True
self.hostname = socket.gethostname()
self.hostname = socket.getfqdn()
self.wake_event = threading.Event()
self.layout_lock = threading.Lock()
self.run_handler_lock = threading.Lock()


Loading…
Cancel
Save