5 files changed, 69 insertions, 7 deletions
diff --git a/doc/source/examples/etc_nodepool/nodepool.yaml b/doc/source/examples/etc_nodepool/nodepool.yaml
index 1c1830635..105b0ef54 100644
--- a/doc/source/examples/etc_nodepool/nodepool.yaml
+++ b/doc/source/examples/etc_nodepool/nodepool.yaml
@@ -7,7 +7,7 @@ zookeeper-tls:
   ca: /var/certs/certs/cacert.pem
 
 labels:
-  - name: ubuntu-focal
+  - name: ubuntu-jammy
 
 providers:
   - name: static-vms
@@ -16,7 +16,7 @@ providers:
       - name: main
         nodes:
           - name: node
-            labels: ubuntu-focal
+            labels: ubuntu-jammy
             host-key: "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOgHJYejINIKzUiuSJ2MN8uPc+dfFrZ9JH1hLWS8gI+g"
             python-path: /usr/bin/python3
             username: root
diff --git a/doc/source/examples/node-Dockerfile b/doc/source/examples/node-Dockerfile
index ff74aa592..b588bcf2c 100644
--- a/doc/source/examples/node-Dockerfile
+++ b/doc/source/examples/node-Dockerfile
@@ -1,4 +1,4 @@
-FROM docker.io/ubuntu:20.04
+FROM docker.io/ubuntu:22.04
 
 RUN apt-get update \
     && DEBIAN_FRONTEND="noninteractive" apt-get -y install \
diff --git a/doc/source/examples/zuul-config/zuul.d/jobs.yaml b/doc/source/examples/zuul-config/zuul.d/jobs.yaml
index 8ad979e46..bb9822f48 100644
--- a/doc/source/examples/zuul-config/zuul.d/jobs.yaml
+++ b/doc/source/examples/zuul-config/zuul.d/jobs.yaml
@@ -3,5 +3,5 @@
     parent: null
     nodeset:
       nodes:
-        - name: ubuntu-focal
-          label: ubuntu-focal
+        - name: ubuntu-jammy
+          label: ubuntu-jammy
diff --git a/doc/source/examples/zuul-config/zuul.d/jobs2.yaml b/doc/source/examples/zuul-config/zuul.d/jobs2.yaml
index a6ed1a633..c7b4a6878 100644
--- a/doc/source/examples/zuul-config/zuul.d/jobs2.yaml
+++ b/doc/source/examples/zuul-config/zuul.d/jobs2.yaml
@@ -18,5 +18,5 @@
     timeout: 1800
     nodeset:
       nodes:
-        - name: ubuntu-focal
-          label: ubuntu-focal
+        - name: ubuntu-jammy
+          label: ubuntu-jammy
diff --git a/doc/source/job-content.rst b/doc/source/job-content.rst
index d6bb07683..643632d5b 100644
--- a/doc/source/job-content.rst
+++ b/doc/source/job-content.rst
@@ -669,6 +669,68 @@ of item.
        - shell: echo example
          when: zuul_success | bool
 
+.. var:: nodepool
+
+   Information about each host from Nodepool is supplied in the
+   `nodepool` host variable.  Availability of values varies based on
+   the node and the driver that supplied it.  Values may be ``null``
+   if they are not applicable.
+
+   .. var:: label
+
+      The nodepool label of this node.
+
+   .. var:: az
+
+      The availability zone in which this node was placed.
+
+   .. var:: cloud
+
+      The name of the cloud in which this node was created.
+
+   .. var:: provider
+
+      The name of the nodepool provider of this node.
+
+   .. var:: region
+
+      The name of the nodepool provider's region.
+
+   .. var:: host_id
+
+      The cloud's host identification for this node's hypervisor.
+
+   .. var:: external_id
+
+      The cloud's identifier for this node.
+
+   .. var:: slot
+
+      If the node supports running multiple jobs on the node, a unique
+      numeric ID for the subdivision of the node assigned to this job.
+      This may be used to avoid build directory collisions.
+
+   .. var:: interface_ip
+
+      The best IP address to use to contact the node as determined by
+      the cloud provider and nodepool.
+
+   .. var:: public_ipv4
+
+      A public IPv4 address of the node.
+
+   .. var:: private_ipv4
+
+      A private IPv4 address of the node.
+
+   .. var:: public_ipv6
+
+      A public IPv6 address of the node.
+
+   .. var:: private_ipv6
+
+      A private IPv6 address of the node.
+
 
 Change Items
 ~~~~~~~~~~~~