zuul
/
zuul
Code Issues Proposed changes

Merge "Handle private IPv6 addresses supplied by Nodepool"

This commit is contained in:
Zuul 2021-05-03 17:48:40 +00:00 committed by Gerrit Code Review
parent d831b18cb4 8d5bc313df
commit f65982cf86
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/base.py
View File

@ -3475,6 +3475,7 @@ class FakeNodepool(object):
public_ipv4=remote_ip,
private_ipv4=None,
public_ipv6=None,
private_ipv6=None,
python_path=self.python_path,
shell_type=self.shell_type,
allocated_to=request_id,

3
zuul/executor/server.py
View File

@ -1584,7 +1584,8 @@ class AnsibleJob(object):
interface_ip=node.get('interface_ip'),
public_ipv4=node.get('public_ipv4'),
private_ipv4=node.get('private_ipv4'),
public_ipv6=node.get('public_ipv6'))))
public_ipv6=node.get('public_ipv6'),
private_ipv6=node.get('private_ipv6'))))
# Ansible >=2.8 introduced "auto" as an
# ansible_python_interpreter argument that looks up

1
zuul/model.py
View File

@ -599,6 +599,7 @@ class Node(ConfigObject):
self.public_ipv4 = None
self.private_ipv4 = None
self.public_ipv6 = None
self.private_ipv6 = None
self.connection_port = 22
self.connection_type = None
self._keys = []