Synchronise 2026.1 with upstream

ansible/inventory/group_vars/all/infra-vms

@@ -224,7 +224,7 @@ infra_vm_users: "{{ users_default }}"
 infra_vm_containers: {}
 
 # Whether to attempt a basic authentication login to a registry when
-# deploying Infrastructure VM node containers
+# deploying infrastructure VM node containers
 infra_vm_manage_containers_registry_attempt_login: "{{ kolla_docker_registry_username is truthy and kolla_docker_registry_password is truthy }}"
 
 ###############################################################################

dev/functions

@@ -139,15 +139,15 @@ function config_init {
 
 function is_dnf {
     if [[ -e /etc/centos-release || -e /etc/rocky-release ]]; then
-        /usr/bin/which dnf >/dev/null 2>&1
+        command -v dnf >/dev/null 2>&1
     else
         return 1
     fi
 }
 
 function is_yum {
     if [[ -e /etc/centos-release || -e /etc/rocky-release ]]; then
-        /usr/bin/which yum >/dev/null 2>&1
+        command -v yum >/dev/null 2>&1
     else
         return 1
     fi

etc/kayobe/ansible-control.yml

@@ -95,7 +95,7 @@
 
 # Dict of containers to deploy.
 # Example:
-# seed_containers:
+# ansible_control_containers:
 #   squid:
 #     image: "docker.io/stackhpc/squid"
 #     pre: "{{ kayobe_env_config_path }}/containers/squid/pre.yml"

etc/kayobe/infra-vms.yml

@@ -181,7 +181,7 @@
 #infra_vm_containers:
 
 # Whether to attempt a basic authentication login to a registry when
-# deploying controller containers
+# deploying infrastructure VM node containers
 #infra_vm_manage_containers_registry_attempt_login:
 
 ###############################################################################

playbooks/kayobe-ansible-control-host-configure-base/overrides.yml.j2

@@ -266,8 +266,8 @@ ansible_control_fail2ban_enabled: true
 custom_etc_hosts_entries:
   foo.example.com: 127.0.0.88
 
-# Deploy a hello-world container.
+# Deploy a test container.
 ansible_control_containers:
-  hello-world:
-    image: docker.io/library/hello-world
-    tag: latest
+  node_exporter:
+    image: "quay.io/prometheus/node-exporter"
+    tag: "latest"

playbooks/kayobe-overcloud-base/overrides.yml.j2

@@ -66,8 +66,8 @@ kolla_base_distro: "{% raw %}{{ 'rocky' if os_distribution == 'centos' else os_d
 # Support overriding container_engine
 container_engine: "{{ container_engine }}"
 
-# Deploy a hello-world container.
+# Deploy a test container.
 controller_containers:
-  hello-world:
-    image: docker.io/library/hello-world
-    tag: latest
+  node_exporter:
+    image: "quay.io/prometheus/node-exporter"
+    tag: "latest"

playbooks/kayobe-overcloud-base/run.yml

@@ -15,7 +15,7 @@
 
     - name: Check that hello-world custom container was deployed
       shell:
-        cmd: "sudo {{ container_engine | default('docker') }} ps -a | grep hello-world"
+        cmd: "sudo {{ container_engine | default('docker') }} ps -a | grep node-exporter"
         executable: /bin/bash
       when: deploy_custom_container | default(false)