Skip to content

Synchronise 2024.1 with upstream #564

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
priteau merged 5 commits into from
May 26, 2026
Merged

Synchronise 2024.1 with upstream #564

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
f912421
Quote baremetal node create arguments
bbezak May 13, 2026
45a7e5f
CI: Exclude docker-ce 29.5.1 on CentOS/Rocky Linux
priteau May 19, 2026
ad0cf3c
Merge "Quote baremetal node create arguments" into unmaintained/2024.1
May 21, 2026
dda4f7d
Revert "CI: Exclude docker-ce 29.5.1 on CentOS/Rocky Linux"
priteau May 21, 2026
d640b18
Bind inspection store to internal network
priteau May 21, 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
4 changes: 2 additions & 2 deletions ansible/baremetal-compute-register.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
--name {{ inventory_hostname }} \
--driver {{ ironic_driver }} \
{% for key, value in ironic_driver_info.items() %}
--driver-info {{ key }}={{ value }} \
--driver-info {{ (key ~ '=' ~ value) | quote }} \
{% endfor %}
{% for key, value in ironic_properties.items() %}
--property {{ key }}={{ value }} \
--property {{ (key ~ '=' ~ value) | quote }} \
{% endfor %}
--resource-class {{ ironic_resource_class }}
when:
Expand Down
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>`__
1 change: 1 addition & 0 deletions roles/kayobe-ci-prep/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,6 @@

- name: Enable the EPEL repository
command: dnf config-manager --disable epel

when: ansible_facts.os_family == 'RedHat'
become: true
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 @@ -127,6 +127,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