Restore the upstream directory structure #200
Reference in New Issue
Block a user
No description provided.
Delete Branch "mchiappero/Factory:alignment-directories"
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?
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.
This PR depends on #199
b3a46f16f1
toaa9aa54149
@@ -90,1 +89,3 @@
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/
Note this empty schema file doesn't exist upstream, it might be a good candidate for an upstream PR with some variable to enable the related Ironic config (disabled by default upstream) - I think it could be justified as other community members may well be interested in enabling other network-data payloads which don't conform to the openstack schema
So, IIUC, you are proposing to keep it in v30.0.0 as well, rather than removing it as in https://src.opensuse.org/suse-edge/Factory/commit/da9f8f9c2c4cd9cd3ab91ec786af39ae8b7680da3fe?
Yes it's necessary to keep this, as it allows us to pass nmstate format for the preprovisioningNetworkData and networkData - without the empty schema Ironic won't allow this as it doesn't match the OpenStack network-data format
I see, fundamental to have then... I will rework the changes, once we have a single patch we can create a branch from there and add the missing bits for proposing the change upstream. Thank you!
@@ -66,1 +65,3 @@
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/runironic-exporter /bin/runlogwatch.sh /bin/configure-nonroot.sh
This copies runironic-exporter which AFAICS was not previously copied, and looks like it won't work due to missing dependencies - since we don't currently test/support it I'd suggest we just remove it and skip copying it from upstream until/unless there is a requirement for it?
It's just a leftover, I'm not sure how it passed the build...
Sorry, I have mis-read your message earlier... So either we copy it to align with upstream until we make a decision or drop it right now? I think it's fine to drop it, but it's not bad to minimize the amount of changes, which is probably what I'd prefer more. Unless I'm missing the point again.
My point is until now this wasn't copied into the image at all (we had an unused file but it's not COPY'd in the Dockerfile)
With this change it is copied, but AFAICS the script won't work because we don't have gunicorn installed.
So I think we have to either remove it, or make it work, I'm proposing the former as I'm not aware of any use-cases currently which require it, but we can perhaps add the missing dependency if you prefer
Thanks for the input, see PR #204.
LGTM, as far as I can see all comments were addressed and I don't see any other issue here, so 👍
aa9aa54149
toef6989b0d8