From f22770938cc4b5a7f61db3bfbc16c3c8532b892b Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Mon, 21 Apr 2025 13:29:13 -0700
Subject: [PATCH] Use private or public ip in nox-remote job

We switched the Zuul tenant to use NIZ, and noticed a small bug:
the nodepool vars dict when set by niz behaves differently compared
to nodepool: the openstack driver will not substitute the public
ip for the private ip if there is no private ip.

Fix this by using either value; we may also update Zuul itself to
supply backwards-compatible behavior in the nodepool dict while
adding a new dict with more consistent behavior.

Change-Id: I9313a45503ae43378ea57f82a30ca15b08bcb690
---
 .zuul.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index b2e1e149ac..1c7c2398ff 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -90,7 +90,7 @@
         ZUUL_ZK_CERT: /opt/zookeeper/ca/certs/client.pem
         ZUUL_ZK_KEY: /opt/zookeeper/ca/keys/clientkey.pem
         ZUUL_SSH_KEY: /home/zuul/.ssh/id_rsa
-        ZUUL_REMOTE_IPV4: "{{ nodepool.private_ipv4 }}"
+        ZUUL_REMOTE_IPV4: "{{ nodepool.private_ipv4 or nodepool.public_ipv4 }}"
         ZUUL_REMOTE_KEEP: "true"
         CI: "1"
       nox_force_python: "3.11"