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 +5 -2
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7a377d7d90 - Show all commits

3
ironic-image/Dockerfile
View File

@@ -88,8 +88,7 @@ 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-config/ironic.conf.j2 /etc/ironic/
COPY ironic-config/network-data-schema-empty.json /etc/ironic/
COPY ironic-config/ironic.conf.j2 ironic-config/network-data-schema-empty.json /etc/ironic/
# DNSMASQ
COPY ironic-config/dnsmasq.conf.j2 /etc/

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

@@ -72,6 +72,9 @@ enable_ssl_api = true
{% endif %}
api_workers = {{ env.NUMWORKERS }}
# Disable schema validation so we can pass nmstate format
network_data_schema = /etc/ironic/network-data-schema-empty.json
[conductor]
steven.hardy commented 2025-07-04 15:24:45 +02:00
Outdated
Review
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
automated_clean = {{ env.IRONIC_AUTOMATED_CLEAN }}
# NOTE(dtantsur): keep aligned with [pxe]boot_retry_timeout below.

1
ironic-image/ironic-config/network-data-schema-empty.json Normal file
View File

@@ -0,0 +1 @@
{}