Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cherry-pick Magnum CAPI commits #537

Merged
merged 5 commits into from
Mar 5, 2024

Conversation

sd109
Copy link

@sd109 sd109 commented Feb 27, 2024

Cherry pick of b644891 from Yoga branch which seems to have been lost at some point.

@sd109 sd109 requested a review from a team as a code owner February 27, 2024 15:49
@sd109
Copy link
Author

sd109 commented Feb 27, 2024

Do I need a separate PR for cherry-pick to stackhpc/zed?

@mnasiadka
Copy link
Member

Maybe I'm a bit grumpy here - but would it be possible that we just cherry-pick what is in Kolla-Ansible upstream already?
[1]: https://review.opendev.org/c/openstack/kolla-ansible/+/896292
[2]: https://review.opendev.org/c/openstack/kolla-ansible/+/904430

Scott Davidson and others added 3 commits February 27, 2024 16:45
This reverts commit 9b7fb2b.
If a file {{ node_custom_config }}/magnum/kubeconfig exists, it is
copied to /var/lib/magnum/.kube/config in all Magnum Service Containers.
At this location, the vexxhost/magnum-cluster-api will loo for the Kubeconfig
configuration file to control the Cluster API Control Plane. If the
vexxhost/magnum-cluster-api is installed in the Magnum container images,
control of a cluster API control plane can then take place via the Magnum API.

Depends-On: https://review.opendev.org/c/openstack/kolla/+/902101
Change-Id: I986c5192fe96b9c480a2d8fa87d719a50ce78186
Closes-Bug: #2047360
Change-Id: I73490d84da39a74ea7ac493c7dd41fe7bfe2f578
@sd109 sd109 changed the title Cherry-pick of missing Magnum commit Cherry-pick Magnum CAPI commits Feb 27, 2024
markgoddard
markgoddard previously approved these changes Feb 28, 2024
@sd109
Copy link
Author

sd109 commented Feb 28, 2024

Converting to draft until I have a working Magnum deployment

@sd109 sd109 marked this pull request as ready for review March 5, 2024 09:11
@sd109 sd109 requested a review from markgoddard March 5, 2024 09:12
@markgoddard markgoddard merged commit 40d59e1 into stackhpc/2023.1 Mar 5, 2024
3 checks passed
@markgoddard markgoddard deleted the fix/magnum-task-ordering branch March 5, 2024 10:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants