pacific: mgr/cephadm: fix 'mgr/cephadm: spec.virtual_ip param should be used by the ingress daemon#44628
Merged
adk3798 merged 2 commits intoceph:pacificfrom Feb 16, 2022
Conversation
Contributor
Author
|
e446970 to
c30de7e
Compare
Contributor
Author
|
changelog: fixed conflict in test_services.py |
|
This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved |
Contributor
Author
|
…e ingress daemon When the ingress spec is built a virtual_ip parameter is provided in the spec and it's expected to see the haproxy instance using the defined value. The defined VIP is properly configured using the keepalived instance and, as per doc [1], the ingress should be able to use this value as entrypoint for the haproxy frontend. This patch also introduces a basic unit test for the IngressService with the purpose of validating the config files generated for both haproxy and keepalived. [1] https://docs.ceph.com/en/latest/cephadm/services/rgw/#high-availability-service-for-rgw Fixes: https://tracker.ceph.com/issues/53684 Signed-off-by: Francesco Pantano <fpantano@redhat.com> (cherry picked from commit 0688ca9) Signed-off-by: Sebastian Wagner <sewagner@redhat.com> Conflicts: src/pybind/mgr/cephadm/tests/test_services.py
c30de7e to
b3595f8
Compare
Contributor
Author
|
changelog: fixed conflict in test_services.py |
The current configuration of keepalived makes it do a curl on localhost:9999 in order to check the endpoint is alive. Given the endpoint only binds on the vip addr, that doesn't work. Fixes: https://tracker.ceph.com/issues/53807 Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
Contributor
Contributor
adk3798
approved these changes
Feb 16, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport of #44374 and #45014