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

WIP: Align config files and scripts with upstream (v30.0.0) #202

Closed
mchiappero wants to merge 14 commits from mchiappero/Factory:alignment-v30.0.0 into main
pull from: mchiappero/Factory:alignment-v30.0.0
merge into: suse-edge:main
Conversation 4 Commits 14 Files Changed 28 +353 -255
mchiappero commented 2025-06-30 18:14:41 +02:00
Owner
Copy Link

Copy the configuration files and scripts from upstream to align with v30.0.0. Leave any SUSE specific customization to separate commits that could be re-applied in the future.

This PR depends on #201.

Copy the configuration files and scripts from upstream to align with v30.0.0. Leave any SUSE specific customization to separate commits that could be re-applied in the future. This PR depends on #201.
mchiappero added 15 commits 2025-06-30 18:14:43 +02:00
Drop inotify-tools and switch to pyinotify
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 22s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 20s
Details
09c8fb927a 
No longer inotifywait use and move to python pyinotify.

See https://github.com/metal3-io/ironic-image/issues/605 for
more details.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
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 14s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in -1m15s
Details
b3a46f16f1 
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>
Apply misc changes to Dockerfile to align with upstream d4f8eee19e 
Having a completely different image and build system the Dockerfile will
always differ quite significantly from the upstream one. Nonetheless,
it's still useful to make the commont parts to look alike as much as
possible to ease maintanance and update.

Note, this is just a small set of changes that are possible, more effort
into this direction may follow at later stage.
Remove stale file entries for old BIOS based machines 37106f7335 
Two entries pointing to old and unesed files for non UEFI servers seem
to be unused both here and upstream, so this commit removes them.
Move the install of EFI packages in prepare-efi.sh eb40007970 
This commit move the installation of packages required for EFI booting
from Dockerfile to prepare-efi.sh, in order to align with upstream.

Also, remove some spaces between some commands in the script to match
upstream.
Move the copy of Jinja templates to resemble upstream
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 13s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 1m12s
Details
fec5b28494 
Follow the same location for the COPY command moving the Jinja template
files in the image.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Copy files from upstream v30.0.0 e5de6f01e4 
Drop all the config and script files into their respective directory
from the upstream release v30.0.0. Any required customization will
follow in subsequent commits, which could potentially be reused for
future realignments.

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use correct paths and modules for Apache b43123b48c 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use ironic-suse user/group in Apache for media fe91f912e7 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use ironic-suse user/group in Apache for API da1b8c6a7d 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use arch named IPA file in IMAGE_CACHE_PREFIX 32a9097859 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use arch specific file for IPA 3e45ba9051 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Use python 3.11 instead of 3.12 a491f828f2 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
Change GRUB path in ironic.conf cebc3e545e 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
update the destination path for jinjia templates
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 31s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 3h15m0s
Details
4a9e341f07 
Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
mchiappero changed title from Align config files and scripts with upstream to WIP: Align config files and scripts with upstream 2025-06-30 18:15:30 +02:00
mchiappero requested review from amorgante 2025-06-30 18:19:07 +02:00
mchiappero force-pushed alignment-v30.0.0 from 4a9e341f07 to 51804fea1d 2025-07-02 10:28:15 +02:00 Compare
mchiappero requested review from dprodanov 2025-07-02 10:30:37 +02:00
mchiappero requested review from nbelouin 2025-07-02 10:30:37 +02:00
mchiappero requested review from steven.hardy 2025-07-02 10:30:37 +02:00
mchiappero force-pushed alignment-v30.0.0 from 51804fea1d to 4bc7e416a8 2025-07-02 15:50:05 +02:00 Compare
mchiappero force-pushed alignment-v30.0.0 from 4bc7e416a8 to 318765a043 2025-07-03 14:50:43 +02:00 Compare
steven.hardy reviewed 2025-07-04 15:24:45 +02:00
ironic-image/ironic-config/ironic.conf.j2 Outdated
steven.hardy commented 2025-07-04 15:24:45 +02:00
Owner
Copy Link

As mentioned in #200 - we can't remove this as it's required to allow Ironic to accept the nmstate network-data format instead of enforcing the openstack schema

We should perhaps push a change to the upstream ironic-image so this can be enabled/disabled via a variable as our use-case isn't unique and the idea of disabling the schema was previously discussed upstream so I expect such a change may be acceptable

As mentioned in #200 - we can't remove this as it's required to allow Ironic to accept the nmstate network-data format instead of enforcing the openstack schema We should perhaps push a change to the upstream ironic-image so this can be enabled/disabled via a variable as our use-case isn't unique and the idea of disabling the schema was previously [discussed upstream]([url](https://kubernetes.slack.com/archives/CHD49TLE7/p1700735069775069?thread_ts=1700663721.985989&cid=CHD49TLE7)) so I expect such a change may be acceptable
steven.hardy reviewed 2025-07-04 15:40:23 +02:00
ironic-image/scripts/runlogwatch.sh
@@ -0,0 +3,4 @@
# Ramdisk logs path
LOG_DIR="/shared/log/ironic/deploy"
mkdir -p "${LOG_DIR}"
steven.hardy commented 2025-07-04 15:40:23 +02:00
Owner
Copy Link

This may reintroduce the spurious restart I fixed in https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image?linkrev=base&rev=10 - at the time I couldn't reproduce the same issue with the upstream environment but it would probably be reasonable to push the change upstream anyway?

This may reintroduce the spurious restart I fixed in https://build.opensuse.org/package/rdiff/isv:SUSE:Edge:Metal3:Ironic:2024.2/ironic-image?linkrev=base&rev=10 - at the time I couldn't reproduce the same issue with the upstream environment but it would probably be reasonable to push the change upstream anyway?
steven.hardy reviewed 2025-07-04 15:46:40 +02:00
ironic-image/ironic-config/apache2-vmedia.conf.j2
@@ -0,0 +12,4 @@
<Directory ~ "/shared/html">
Order deny,allow
deny from all
steven.hardy commented 2025-07-04 15:46:40 +02:00
Owner
Copy Link

This reverts the fix I made for https://gitlab.com/sylva-projects/sylva-core/-/issues/2147 but I think it's probably OK since the uefi bootloader is now access via file:// instead of the vmedia webserver

This reverts the fix I made for https://gitlab.com/sylva-projects/sylva-core/-/issues/2147 but I think it's probably OK since the uefi bootloader is now access via `file://` instead of the vmedia webserver
mchiappero added 1 commit 2025-07-04 17:13:48 +02:00
Disable the network schema check to allow for nmstate definitions
Some checks failed
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in -1m46s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Failing after 3h23m7s
Details
a9551f2fcb 
Bypass the OpenStack network-data format validation, to allow for the
nmstate based one we instead use (which would otherwise fail).

Signed-off-by: Marco Chiappero <marco.chiappero@suse.com>
mchiappero force-pushed alignment-v30.0.0 from a9551f2fcb to 0efa970293 2025-07-04 17:24:19 +02:00 Compare
mchiappero changed title from WIP: Align config files and scripts with upstream to WIP: Align config files and scripts with upstream (v30.0.0) 2025-07-08 13:07:15 +02:00
mchiappero commented 2025-09-05 13:28:15 +02:00
Author
Owner
Copy Link

I'm going to drop this PR since in the meantime upstream has move forward with newer releases.

I'm going to drop this PR since in the meantime upstream has move forward with newer releases.
mchiappero closed this pull request 2025-09-05 13:28:16 +02:00
All checks were successful
Check Release Manifest Local Charts Versions / Check Release Manifest Local Charts Versions (pull_request) Successful in 10s
Details
Build PR in OBS / Build PR in OBS (pull_request_target) Successful in 12s
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
amorgante
nbelouin
steven.hardy
dprodanov
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
amorgante atanasdinov atrendafilov dbekhit dprodanov eminguez fdegirmenci geoagriogiannis ipetrov117 jtomasek kzhelyazkov mchiappero nbelouin roxenham steven.hardy
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: suse-edge/Factory#202
No description provided.
Delete Branch "mchiappero/Factory:alignment-v30.0.0"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?