From 044d70bc5dfe010101d1d11f67be8164272f9377 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 3 Jun 2026 22:58:01 +0200 Subject: [PATCH 1/3] CI: Stop using image from Docker Hub Some CI jobs are hitting rate limits. Change-Id: Iad22b28c39a023d26f89b753af73dd730d000cea Signed-off-by: Pierre Riteau (cherry picked from commit d564feffded2fbb42efbe2626e618e3f232b0791) --- .../overrides.yml.j2 | 8 ++++---- playbooks/kayobe-overcloud-base/overrides.yml.j2 | 8 ++++---- playbooks/kayobe-overcloud-base/run.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/playbooks/kayobe-ansible-control-host-configure-base/overrides.yml.j2 b/playbooks/kayobe-ansible-control-host-configure-base/overrides.yml.j2 index 34a2faef7..a5940cabd 100644 --- a/playbooks/kayobe-ansible-control-host-configure-base/overrides.yml.j2 +++ b/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 \ No newline at end of file + node_exporter: + image: "quay.io/prometheus/node-exporter" + tag: "latest" diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index 913b847e6..72eeb2018 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/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" diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index 0c7820d5c..9fcb2da17 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/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) From 298cde3c19b3d6c644af34f5cb640951b522571e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Wed, 3 Jun 2026 23:15:58 +0200 Subject: [PATCH 2/3] Replace `which` with `command` `command` is a builtin command in any POSIX-compatible shell, while `which` is an extra package which can be absent. Change-Id: I8a1f505e17fa282d9eb3c76cb703b84b322b3dbb Signed-off-by: Pierre Riteau (cherry picked from commit 0e1fab73cd9b45b5e317f8fddb729d1a6896656a) --- dev/functions | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/functions b/dev/functions index 547965730..4c0ebb47d 100644 --- a/dev/functions +++ b/dev/functions @@ -139,7 +139,7 @@ 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 @@ -147,7 +147,7 @@ function is_dnf { 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 From a7d1d06223f6afb2a8714d1e20ef076406664159 Mon Sep 17 00:00:00 2001 From: Leonie Chamberlin-Medd Date: Mon, 1 Jun 2026 14:38:13 +0100 Subject: [PATCH 3/3] Fix naming of custom container variables Updates the custom container example in ansible-control.yml to the correct variable, and updates a description in infra-vms.yml to reference the correct container. Closes-Bug: #2154741 Change-Id: I122af26524197e3d67bbf46a75ff632b836beabe Signed-off-by: Leonie Chamberlin-Medd (cherry picked from commit 444db636625b3ffae1b9cf03045463787fa485a0) --- ansible/inventory/group_vars/all/infra-vms | 2 +- etc/kayobe/ansible-control.yml | 2 +- etc/kayobe/infra-vms.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/inventory/group_vars/all/infra-vms b/ansible/inventory/group_vars/all/infra-vms index f5643aab1..848656e7c 100644 --- a/ansible/inventory/group_vars/all/infra-vms +++ b/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 }}" ############################################################################### diff --git a/etc/kayobe/ansible-control.yml b/etc/kayobe/ansible-control.yml index 5c3ca32cf..fb1b3fd66 100644 --- a/etc/kayobe/ansible-control.yml +++ b/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" diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index e8bc24ef0..806504de3 100644 --- a/etc/kayobe/infra-vms.yml +++ b/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: ###############################################################################