]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: pass daemon's current image when reconfiguring
authorAdam King <adking@redhat.com>
Wed, 3 Apr 2024 17:11:08 +0000 (13:11 -0400)
committerAdam King <adking@redhat.com>
Wed, 17 Apr 2024 12:27:42 +0000 (08:27 -0400)
commit069a25d8584b2dcddb89ba0cc062367130413e01
treedecc8e75aeb25a59183f86ea73966fe7b443f7cf
parenta0df3e2b3ed3368be298d00064d6d4dc945a527e
mgr/cephadm: pass daemon's current image when reconfiguring

Important to note here is that a reconfig will rewrite
the config files of the daemon and restart it, but not
rewrite the unit files. This lead to a bug where the
grafana image we used between the quincy and squid release
used different UIDs internally, which caused us to rewrite
the config files as owned by a UID that worked with the
new image but did not work with the image still specified
in the unit.run file. This meant the grafana daemon was down
from a bit after the mgr upgrade until the end
of the upgrade when we redeploy all the monitoring images.

Fixes: https://tracker.ceph.com/issues/65234
Signed-off-by: Adam King <adking@redhat.com>
(cherry picked from commit 5922d20e05ef60414e72d11d0e947093d92dc288)

Conflicts:
src/pybind/mgr/cephadm/tests/test_services.py
src/pybind/mgr/cephadm/module.py
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py
src/pybind/mgr/cephadm/tests/test_services.py