Skip to content

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
sebastian-philipp:pacific-backport-44374
Feb 16, 2022
Merged

pacific: mgr/cephadm: fix 'mgr/cephadm: spec.virtual_ip param should be used by the ingress daemon#44628
adk3798 merged 2 commits intoceph:pacificfrom
sebastian-philipp:pacific-backport-44374

Conversation

@sebastian-philipp
Copy link
Contributor

@sebastian-philipp sebastian-philipp commented Jan 18, 2022

Backport of #44374 and #45014

@sebastian-philipp
Copy link
Contributor Author

    @patch("cephadm.serve.CephadmServe._run_cephadm")
    def test_ingress_config(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
>       _run_cephadm.side_effect = async_side_effect(('{}', '', 0))
E       NameError: name 'async_side_effect' is not defined

@sebastian-philipp
Copy link
Contributor Author

changelog: fixed conflict in test_services.py

@github-actions
Copy link

This pull request can no longer be automatically merged: a rebase is needed and changes have to be manually resolved

@sebastian-philipp
Copy link
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
@sebastian-philipp
Copy link
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>
@adk3798
Copy link
Contributor

adk3798 commented Feb 15, 2022

changelog: Added backport of #45014 as that PR fixes a test failure #44374 causes

@adk3798 adk3798 merged commit e5edbf8 into ceph:pacific Feb 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants