suse-edge/Factory
SHA256
17
0
Fork 17
Code Issues Pull Requests 3 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 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 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
dprodanov
nbelouin
steven.hardy
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
amorgante antaloala atanasdinov atrendafilov dbekhit dprodanov eminguez fdegirmenci geoagriogiannis ipetrov117 jarndt jtomasek kzhelyazkov mchiappero mkrutov nbelouin roxenham steven.hardy
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: suse-edge/Factory#202
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?