Skip to content

Synchronise 2025.1 with upstream #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 5 commits into from
May 26, 2026
Merged

Synchronise 2025.1 with upstream #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8feef04
CI: Exclude docker-ce 29.5.1 on CentOS/Rocky Linux
priteau May 19, 2026
95ae739
[CI] Switch to baseurl for all repos
jovial May 14, 2026
2c2d4d3
Revert "CI: Exclude docker-ce 29.5.1 on CentOS/Rocky Linux"
priteau May 21, 2026
54ead71
Bind inspection store to internal network
priteau May 21, 2026
79eee68
Merge "Bind inspection store to internal network" into stable/2025.1
May 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/inspection-store/templates/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ http {
#gzip on;

server {
listen {{ inspection_store_port }};
listen {{ internal_net_name | net_ip }}:{{ inspection_store_port }};
root /data;
location /ironic-inspector {
return 200 "";
Expand Down
6 changes: 6 additions & 0 deletions releasenotes/notes/inspection-store-nginx-listen-6ed8e936594e04f0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
security:
- |
Fixes nginx configuration of the ``inspection_store`` container to listen
on the internal network instead of binding to all interfaces.
`LP#2153801 <https://bugs.launchpad.net/kayobe/+bug/2153801>`__
12 changes: 11 additions & 1 deletion roles/kayobe-ci-prep/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,20 @@
vars:
configure_ephemeral_mountpoint: "{{ '/var/lib/containers' if container_engine | default('docker') == 'podman' else '/var/lib/docker' }}"

- name: Find YUM repo files
become: true
ansible.builtin.find:
paths: /etc/yum.repos.d
patterns: "*.repo"
file_type: file
register: repo_files
when: ansible_facts.distribution == "Rocky"

- name: Set Rocky Linux mirror to download.rockylinux.org
become: true
ansible.builtin.shell:
cmd: sed -i 's/mirrorlist/#mirrorlist/g; s/#baseurl/baseurl/g' /etc/yum.repos.d/rocky.repo
cmd: sed -i 's/mirrorlist/#mirrorlist/g; s/#baseurl/baseurl/g' {{ item }}
loop: "{{ repo_files.files | map(attribute='path') | list }}"
when: ansible_facts.distribution == "Rocky"

- block:
Expand Down
5 changes: 5 additions & 0 deletions roles/kayobe-diagnostics/files/get_logs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,11 @@ copy_logs() {
cp /opt/kayobe/images/ipa/ipa.stderr /opt/kayobe/images/ipa/ipa.stdout ${LOG_DIR}/kayobe/
fi

# Inspection store
if [[ -d /opt/kayobe/etc/inspection-store ]]; then
cp -rnL /opt/kayobe/etc/inspection-store ${LOG_DIR}/kayobe/
fi

# Overcloud host image build logs
if [[ -f /opt/kayobe/images/deployment_image/deployment_image.stderr ]] || [[ -f /opt/kayobe/images/deployment_image/deployment_image.stdout ]]; then
mkdir -p ${LOG_DIR}/kayobe
Expand Down