From 44b73b52ad8dacc961570f0eca211185b32fc569 Mon Sep 17 00:00:00 2001 From: Marek Skrobacki Date: Wed, 19 Feb 2025 15:17:13 +0000 Subject: [PATCH 1/4] IPA: move static file to the correct folder --- .../undercloud-ipa}/static/etc/chrony/chrony.conf | 0 .../system/systemd-networkd-wait-online.service.d/justone.conf | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename ironic-images/{ => custom_elements/undercloud-ipa}/static/etc/chrony/chrony.conf (100%) rename ironic-images/{ => custom_elements/undercloud-ipa}/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf (100%) diff --git a/ironic-images/static/etc/chrony/chrony.conf b/ironic-images/custom_elements/undercloud-ipa/static/etc/chrony/chrony.conf similarity index 100% rename from ironic-images/static/etc/chrony/chrony.conf rename to ironic-images/custom_elements/undercloud-ipa/static/etc/chrony/chrony.conf diff --git a/ironic-images/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf similarity index 100% rename from ironic-images/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf rename to ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/system/systemd-networkd-wait-online.service.d/justone.conf From d42679b95d3173acbe8000eb732a614965189733 Mon Sep 17 00:00:00 2001 From: Marek Skrobacki Date: Wed, 19 Feb 2025 15:22:56 +0000 Subject: [PATCH 2/4] IPA: attempt to disable systemd-networkd --- .../undercloud-ipa/static/etc/systemd/network/99-dhcp.network | 1 + 1 file changed, 1 insertion(+) create mode 100644 ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network diff --git a/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network new file mode 100644 index 000000000..371808583 --- /dev/null +++ b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network @@ -0,0 +1 @@ +# No-op to avoid double DHCP From 51ca21c82095f75abb85c7fd559c3dcad96610b5 Mon Sep 17 00:00:00 2001 From: Marek Skrobacki Date: Wed, 19 Feb 2025 15:38:36 +0000 Subject: [PATCH 3/4] build-ironic-images: publish images if done through workflow_dispatch --- .github/workflows/build-ironic-images.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-ironic-images.yaml b/.github/workflows/build-ironic-images.yaml index 0d48ba541..64a623004 100644 --- a/.github/workflows/build-ironic-images.yaml +++ b/.github/workflows/build-ironic-images.yaml @@ -136,7 +136,7 @@ jobs: make_latest: true fail_on_unmatched_files: true files: ironic-images/upload/* - if: ${{ github.ref == 'refs/heads/main' }} + if: ${{ github.ref == 'refs/heads/main' || github.event_name == 'workflow_dispatch' }} cleanup: runs-on: ubuntu-latest From 521df4bf2c07ec1634dd5052594f49a82d6ff65b Mon Sep 17 00:00:00 2001 From: Marek Skrobacki Date: Wed, 19 Feb 2025 15:59:22 +0000 Subject: [PATCH 4/4] IPA: disable systemd-networkd's DHCP client for eth interfaces --- .../etc/systemd/network/10-disable-systemd-dhcp.network | 8 ++++++++ .../static/etc/systemd/network/99-dhcp.network | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network delete mode 100644 ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network diff --git a/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network new file mode 100644 index 000000000..600173e29 --- /dev/null +++ b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/10-disable-systemd-dhcp.network @@ -0,0 +1,8 @@ +# We need to explicitly disable systemd-networkd's default of launching DHCP +# client on all ethernet interfaces because this is already handled by the +# dhcp-all-interfaces script that comes with IPA +[Match] +Name=en* + +[Network] +DHCP=no diff --git a/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network b/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network deleted file mode 100644 index 371808583..000000000 --- a/ironic-images/custom_elements/undercloud-ipa/static/etc/systemd/network/99-dhcp.network +++ /dev/null @@ -1 +0,0 @@ -# No-op to avoid double DHCP