sapcc / ironic

A service for managing and provisioning Bare Metal servers.
http://openstack.org
Apache License 2.0
0 stars 1 forks source link

create stable/2023.1-m3 #25

Open sandzwerg opened 7 months ago

sandzwerg commented 7 months ago

Changes we have on top of xena and thus probably need for 2023.1 as well are:

git cherry -v stable/xena stable/xena-m3

sandzwerg commented 2 months ago

So I added all commits with a checkmark. @stefanhipfel @fwiesel would one of you have some time to look into the remaining three? These give merge errors to cherry-pick. Afterward we need to adjust some pointers in the custom-resources which still point to xena stuff, but ideally the rest will work.

fwiesel commented 2 months ago

We should upstream af5b98f39b15460e8800824fde199b717bcd84ce, it looks generally useful.

fwiesel commented 2 months ago

Merged https://github.com/sapcc/ironic/commit/af5b98f39b15460e8800824fde199b717bcd84ce and https://github.com/sapcc/ironic/commit/bc3596fe30fddc1f27dddc51413311a3e6c564a2 into https://github.com/sapcc/ironic/commit/8e56539e2e913697a6c69741f470ecec04f3e8d9

fwiesel commented 2 months ago

Merged https://github.com/sapcc/ironic/commit/5baf13afddf0c7420c26912743051b2bae94f376, but not sure if it is needed.

sandzwerg commented 2 months ago

@fwiesel would you feel comfortable to upstream af5b98f39b15460e8800824fde199b717bcd84ce or 8e56539e2e913697a6c69741f470ecec04f3e8d9 or should I ask Stefan?

fwiesel commented 2 months ago

I'll give https://github.com/sapcc/ironic/commit/8e56539e2e913697a6c69741f470ecec04f3e8d9 a try.