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.

Sign up for GitHub

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

Jump to bottom

pacific: cephadm: allow ports to be opened in firewall during adoption, reconfig, redeploy #52083

Merged
merged 3 commits into from Oct 17, 2023
Merged

pacific: cephadm: allow ports to be opened in firewall during adoption, reconfig, redeploy #52083

merged 3 commits into from Oct 17, 2023

Commits on Jun 15, 2023

  1. cephadm: still try to open ports in firewall on redeploy/reconfig 

    Prior to this patch we were discarding the provided
ports on reconfig and redeploy in order to not fail
thinking there was a port conflict with the instance
of the daemon we were about to reconfig/redeploy. However,
it's still desirable for us to make sure the firewall ports
are open when we do a reconfig/redpeloy, so this refactors
the port handling approach to have it do that but
still avoid checking for port conflicts. It also include
an update of the type signature of deploy_daemon
to the py3 style. That wasn't needed for the change
but since I was added an arugment there I thought we might
as well do it now.

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit fdecd66)

Conflicts:
	src/cephadm/cephadm
	src/cephadm/tests/test_cephadm.py
    @adk3798
    adk3798 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    7195631 View commit details
    Browse the repository at this point in the history

  2. cephadm: open ports in firewall when adopting monitoring stack daemons 

    Otherwise we risk the prometheus/alertmanager/grafana
not functioning properly after adoption due to the necessary
port in the firewall not being open.

Fixes: https://tracker.ceph.com/issues/59443

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 40a9817)
    @adk3798
    adk3798 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    8110ca7 View commit details
    Browse the repository at this point in the history

  3. cephadm: use enum for tracking redeploy/reconfig 

    Since the options are mutually exclusive, using
an enum is preferable to having multiple bools
to track each of them

Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 7081759)

Conflicts:
	src/cephadm/cephadm
    @adk3798
    adk3798 committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    c5bb895 View commit details
    Browse the repository at this point in the history