]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
cephadm: still try to open ports in firewall on redeploy/reconfig
authorAdam King <adking@redhat.com>
Thu, 13 Apr 2023 17:05:11 +0000 (13:05 -0400)
committerAdam King <adking@redhat.com>
Tue, 5 Mar 2024 14:51:30 +0000 (09:51 -0500)
commit3f00dd5a73994b171a8bdeda87e20f08c65f8c49
treeafd89b70450495234c283c33f0c6c175f870ee5f
parent7b464252f50f912b6bddd9129ce15a2a898ee7de
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 fdecd66f1306d3bf60780dbd44c9cb8e63b3892a)

Conflicts:
src/cephadm/cephadm
src/cephadm/cephadm
src/cephadm/tests/test_cephadm.py