suse-edge/Factory
SHA256
14
0
Fork 15
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: suse-edge:aa9aa54149a31fb8352b43b003ba6cfba01ed98a7beca03848c3cb405af5c819
Branches Tags
suse-edge:main suse-edge:3.3 suse-edge:3.2 suse-edge:devel
..
compare: suse-edge:ef6989b0d84c049328f662f21e5c89d9911667b1f2dc12e973e76c853d155935
Branches Tags
suse-edge:main suse-edge:3.3 suse-edge:3.2 suse-edge:devel

2 Commits
aa9aa54149 ... ef6989b0d8

Author SHA256 Message Date
Marco Chiappero
ef6989b0d8 Restore the upstream directory structure
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m50s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 18s
Details 
It is now possible to bring back the original directory structure for
config (/ironic-config) files and scripts (/scripts). This will make
updates to re-align with upstream easier.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-07 21:45:39 +00:00
Marco Chiappero
b2ca623d14 Remove unused prometheus exporter
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m49s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m35s
Details 
The Prometheus exporter is effectively, not only unused, but
unusable, due to missing dependencies. Since currently we
don't have use case for it, opt for dropping the exporter
entirely from the image.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
 2025-07-07 13:12:16 +00:00
4 changed files with 1 additions and 19 deletions
Expand all files Collapse all files

2
ironic-image/Dockerfile
View File

@@ -64,7 +64,7 @@ RUN set -euo pipefail; chmod +x /usr/bin/mkisofs
COPY scripts/ /bin/
COPY configure-nonroot.sh /bin/
RUN set -euo pipefail; chmod +x /bin/configure-ironic.sh /bin/rundnsmasq /bin/runhttpd /bin/runironic /bin/runironic-exporter /bin/runlogwatch.sh /bin/configure-nonroot.sh
RUN set -euo pipefail; chmod +x /bin/configure-ironic.sh /bin/rundnsmasq /bin/runhttpd /bin/runironic /bin/runlogwatch.sh /bin/configure-nonroot.sh
RUN mkdir -p /tftpboot
RUN mkdir -p $GRUB_DIR

5
ironic-image/ironic-config/ironic.conf.j2
View File

@@ -187,11 +187,6 @@ insecure = {{ env.IRONIC_INSECURE }}
[nova]
send_power_notifications = false
[oslo_messaging_notifications]
driver = prometheus_exporter
location = /shared/ironic_prometheus_exporter
transport_url = fake://
[pxe]
# NOTE(dtantsur): keep this value at least 3x lower than
# [conductor]deploy_callback_timeout so that at least some retries happen.

1
ironic-image/scripts/configure-ironic.sh
View File

@@ -84,7 +84,6 @@ echo 'Options set from Environment variables'
env | grep "^OS_" || true
mkdir -p /shared/html
mkdir -p /shared/ironic_prometheus_exporter
configure_json_rpc_auth

12
ironic-image/scripts/runironic-exporter
View File

@@ -1,12 +0,0 @@
#!/usr/bin/bash
# shellcheck disable=SC1091
. /bin/configure-ironic.sh
FLASK_RUN_HOST=${FLASK_RUN_HOST:-0.0.0.0}
FLASK_RUN_PORT=${FLASK_RUN_PORT:-9608}
export IRONIC_CONFIG="/etc/ironic/ironic.conf"
exec gunicorn -b "${FLASK_RUN_HOST}:${FLASK_RUN_PORT}" -w 4 \
ironic_prometheus_exporter.app.wsgi:application