commit 93db6a8c7526082cf1c8091fa90b55ca99d9b669
author Jenkins <jenkins@review.openstack.org> Mon Apr 17 20:49:06 2017 +0000
committer Gerrit Code Review <review@openstack.org> Mon Apr 17 20:49:06 2017 +0000
tree 4ca75b0aab74df78e7795267c8b767e3f7510593
parent fb8d6fe07da7c80051fd812801432b0abe6ad4ce
parent 56f61333c0e5a3a37519051352bf08199242d295

Merge "Send interface_ip in the node description" into feature/zuulv3

tests/base.py

diff --git a/tests/base.py b/tests/base.py
index 4d358c9..a0a986a 100755
--- a/tests/base.py
+++ b/tests/base.py
@@ -996,6 +996,7 @@
                     provider='test-provider',
                     region='test-region',
                     az='test-az',
+                    interface_ip='127.0.0.1',
                     public_ipv4='127.0.0.1',
                     private_ipv4=None,
                     public_ipv6=None,

zuul/executor/client.py

diff --git a/zuul/executor/client.py b/zuul/executor/client.py
index 90cfa9b..461af0b 100644
--- a/zuul/executor/client.py
+++ b/zuul/executor/client.py
@@ -307,6 +307,7 @@
                               host_keys=node.host_keys,
                               provider=node.provider,
                               region=node.region,
+                              interface_ip=node.interface_ip,
                               public_ipv6=node.public_ipv6,
                               public_ipv4=node.public_ipv4))
         params['nodes'] = nodes

zuul/model.py

diff --git a/zuul/model.py b/zuul/model.py
index 744c0f3..d12abf4 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -384,6 +384,7 @@
         # Attributes from Nodepool
         self._state = 'unknown'
         self.state_time = time.time()
+        self.interface_ip = None
         self.public_ipv4 = None
         self.private_ipv4 = None
         self.public_ipv6 = None