From ef6989b0d84c049328f662f21e5c89d9911667b1f2dc12e973e76c853d155935 Mon Sep 17 00:00:00 2001 From: Marco Chiappero Date: Tue, 24 Jun 2025 12:09:31 +0000 Subject: [PATCH] Restore the upstream directory structure 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 --- ironic-image/Dockerfile | 21 ++++++++++--------- .../{ => ironic-config}/apache2-ipxe.conf.j2 | 0 .../apache2-vmedia.conf.j2 | 0 .../{ => ironic-config}/dnsmasq.conf.j2 | 0 .../httpd-ironic-api.conf.j2 | 0 .../{ => ironic-config}/httpd-modules.conf | 0 .../{ => ironic-config}/httpd.conf.j2 | 0 .../{ => ironic-config}/inspector.ipxe.j2 | 0 .../{ => ironic-config}/ipxe_config.template | 0 .../{ => ironic-config}/ironic.conf.j2 | 0 .../network-data-schema-empty.json | 0 ironic-image/{ => scripts}/auth-common.sh | 0 .../{ => scripts}/configure-ironic.sh | 0 ironic-image/{ => scripts}/ironic-common.sh | 0 ironic-image/{ => scripts}/ironic-probe.j2 | 0 ironic-image/{ => scripts}/rundnsmasq | 0 ironic-image/{ => scripts}/runhttpd | 0 ironic-image/{ => scripts}/runironic | 0 ironic-image/{ => scripts}/runlogwatch.sh | 0 ironic-image/{ => scripts}/tls-common.sh | 0 20 files changed, 11 insertions(+), 10 deletions(-) rename ironic-image/{ => ironic-config}/apache2-ipxe.conf.j2 (100%) rename ironic-image/{ => ironic-config}/apache2-vmedia.conf.j2 (100%) rename ironic-image/{ => ironic-config}/dnsmasq.conf.j2 (100%) rename ironic-image/{ => ironic-config}/httpd-ironic-api.conf.j2 (100%) rename ironic-image/{ => ironic-config}/httpd-modules.conf (100%) rename ironic-image/{ => ironic-config}/httpd.conf.j2 (100%) rename ironic-image/{ => ironic-config}/inspector.ipxe.j2 (100%) rename ironic-image/{ => ironic-config}/ipxe_config.template (100%) rename ironic-image/{ => ironic-config}/ironic.conf.j2 (100%) rename ironic-image/{ => ironic-config}/network-data-schema-empty.json (100%) rename ironic-image/{ => scripts}/auth-common.sh (100%) rename ironic-image/{ => scripts}/configure-ironic.sh (100%) rename ironic-image/{ => scripts}/ironic-common.sh (100%) rename ironic-image/{ => scripts}/ironic-probe.j2 (100%) rename ironic-image/{ => scripts}/rundnsmasq (100%) rename ironic-image/{ => scripts}/runhttpd (100%) rename ironic-image/{ => scripts}/runironic (100%) rename ironic-image/{ => scripts}/runlogwatch.sh (100%) rename ironic-image/{ => scripts}/tls-common.sh (100%) diff --git a/ironic-image/Dockerfile b/ironic-image/Dockerfile index 3f779c1..e8030c1 100644 --- a/ironic-image/Dockerfile +++ b/ironic-image/Dockerfile @@ -62,8 +62,9 @@ RUN echo 'alias mkisofs="xorriso -as mkisofs"' >> ~/.bashrc COPY mkisofs_wrapper /usr/bin/mkisofs RUN set -euo pipefail; chmod +x /usr/bin/mkisofs -COPY auth-common.sh configure-ironic.sh ironic-common.sh rundnsmasq runhttpd runironic runlogwatch.sh tls-common.sh configure-nonroot.sh ironic-probe.j2 /bin/ -RUN set -euo pipefail; chmod +x /bin/auth-common.sh; chmod +x /bin/configure-ironic.sh; chmod +x /bin/ironic-common.sh; chmod +x /bin/rundnsmasq; chmod +x /bin/runhttpd; chmod +x /bin/runironic; chmod +x /bin/runlogwatch.sh; chmod +x /bin/tls-common.sh; chmod +x /bin/configure-nonroot.sh; +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/runlogwatch.sh /bin/configure-nonroot.sh RUN mkdir -p /tftpboot RUN mkdir -p $GRUB_DIR @@ -85,18 +86,18 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then\ COPY --from=base /tmp/esp-x86_64.img /tmp/uefi_esp-x86_64.img COPY --from=base /tmp/esp-aarch64.img /tmp/uefi_esp-arm64.img -COPY ironic.conf.j2 /etc/ironic/ -COPY inspector.ipxe.j2 httpd-ironic-api.conf.j2 ipxe_config.template /tmp/ -COPY network-data-schema-empty.json /etc/ironic/ +COPY ironic-config/ironic.conf.j2 /etc/ironic/ +COPY ironic-config/inspector.ipxe.j2 ironic-config/httpd-ironic-api.conf.j2 ironic-config/ipxe_config.template /tmp/ +COPY ironic-config/network-data-schema-empty.json /etc/ironic/ # DNSMASQ -COPY dnsmasq.conf.j2 /etc/ +COPY ironic-config/dnsmasq.conf.j2 /etc/ # Custom httpd config, removes all but the bare minimum needed modules -COPY httpd.conf.j2 /etc/httpd/conf/ -COPY httpd-modules.conf /etc/httpd/conf.modules.d/ -COPY apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2 -COPY apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2 +COPY ironic-config/httpd.conf.j2 /etc/httpd/conf/ +COPY ironic-config/httpd-modules.conf /etc/httpd/conf.modules.d/ +COPY ironic-config/apache2-vmedia.conf.j2 /etc/httpd-vmedia.conf.j2 +COPY ironic-config/apache2-ipxe.conf.j2 /etc/httpd-ipxe.conf.j2 # Workaround # Removing the 010-ironic.conf file that comes with the package diff --git a/ironic-image/apache2-ipxe.conf.j2 b/ironic-image/ironic-config/apache2-ipxe.conf.j2 similarity index 100% rename from ironic-image/apache2-ipxe.conf.j2 rename to ironic-image/ironic-config/apache2-ipxe.conf.j2 diff --git a/ironic-image/apache2-vmedia.conf.j2 b/ironic-image/ironic-config/apache2-vmedia.conf.j2 similarity index 100% rename from ironic-image/apache2-vmedia.conf.j2 rename to ironic-image/ironic-config/apache2-vmedia.conf.j2 diff --git a/ironic-image/dnsmasq.conf.j2 b/ironic-image/ironic-config/dnsmasq.conf.j2 similarity index 100% rename from ironic-image/dnsmasq.conf.j2 rename to ironic-image/ironic-config/dnsmasq.conf.j2 diff --git a/ironic-image/httpd-ironic-api.conf.j2 b/ironic-image/ironic-config/httpd-ironic-api.conf.j2 similarity index 100% rename from ironic-image/httpd-ironic-api.conf.j2 rename to ironic-image/ironic-config/httpd-ironic-api.conf.j2 diff --git a/ironic-image/httpd-modules.conf b/ironic-image/ironic-config/httpd-modules.conf similarity index 100% rename from ironic-image/httpd-modules.conf rename to ironic-image/ironic-config/httpd-modules.conf diff --git a/ironic-image/httpd.conf.j2 b/ironic-image/ironic-config/httpd.conf.j2 similarity index 100% rename from ironic-image/httpd.conf.j2 rename to ironic-image/ironic-config/httpd.conf.j2 diff --git a/ironic-image/inspector.ipxe.j2 b/ironic-image/ironic-config/inspector.ipxe.j2 similarity index 100% rename from ironic-image/inspector.ipxe.j2 rename to ironic-image/ironic-config/inspector.ipxe.j2 diff --git a/ironic-image/ipxe_config.template b/ironic-image/ironic-config/ipxe_config.template similarity index 100% rename from ironic-image/ipxe_config.template rename to ironic-image/ironic-config/ipxe_config.template diff --git a/ironic-image/ironic.conf.j2 b/ironic-image/ironic-config/ironic.conf.j2 similarity index 100% rename from ironic-image/ironic.conf.j2 rename to ironic-image/ironic-config/ironic.conf.j2 diff --git a/ironic-image/network-data-schema-empty.json b/ironic-image/ironic-config/network-data-schema-empty.json similarity index 100% rename from ironic-image/network-data-schema-empty.json rename to ironic-image/ironic-config/network-data-schema-empty.json diff --git a/ironic-image/auth-common.sh b/ironic-image/scripts/auth-common.sh similarity index 100% rename from ironic-image/auth-common.sh rename to ironic-image/scripts/auth-common.sh diff --git a/ironic-image/configure-ironic.sh b/ironic-image/scripts/configure-ironic.sh similarity index 100% rename from ironic-image/configure-ironic.sh rename to ironic-image/scripts/configure-ironic.sh diff --git a/ironic-image/ironic-common.sh b/ironic-image/scripts/ironic-common.sh similarity index 100% rename from ironic-image/ironic-common.sh rename to ironic-image/scripts/ironic-common.sh diff --git a/ironic-image/ironic-probe.j2 b/ironic-image/scripts/ironic-probe.j2 similarity index 100% rename from ironic-image/ironic-probe.j2 rename to ironic-image/scripts/ironic-probe.j2 diff --git a/ironic-image/rundnsmasq b/ironic-image/scripts/rundnsmasq similarity index 100% rename from ironic-image/rundnsmasq rename to ironic-image/scripts/rundnsmasq diff --git a/ironic-image/runhttpd b/ironic-image/scripts/runhttpd similarity index 100% rename from ironic-image/runhttpd rename to ironic-image/scripts/runhttpd diff --git a/ironic-image/runironic b/ironic-image/scripts/runironic similarity index 100% rename from ironic-image/runironic rename to ironic-image/scripts/runironic diff --git a/ironic-image/runlogwatch.sh b/ironic-image/scripts/runlogwatch.sh similarity index 100% rename from ironic-image/runlogwatch.sh rename to ironic-image/scripts/runlogwatch.sh diff --git a/ironic-image/tls-common.sh b/ironic-image/scripts/tls-common.sh similarity index 100% rename from ironic-image/tls-common.sh rename to ironic-image/scripts/tls-common.sh -- 2.49.0