From 844d02a5553d5618f1eda2341cf5c4456e7935cf Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Mon, 24 Jun 2024 17:41:10 +0200 Subject: [PATCH] mgr/cephadm: redeploy when some dependency daemon is add/removed previous code was failing to redeploy in some scenarios when daemons are removed. The new check takes into account both when services are add or removed plus changes on the secure_monitoring_stack value. Signed-off-by: Redouane Kachach (cherry picked from commit faa2daf8a701db64a7cf13d7290634f7e51fe6d7) --- src/pybind/mgr/cephadm/serve.py | 2 +- src/pybind/mgr/cephadm/tests/test_services.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 4eb1bfe3d7b..606fe744d7e 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -1093,7 +1093,7 @@ class CephadmServe: action = 'reconfig' # we need only redeploy if secure_monitoring_stack value has changed: if dd.daemon_type in ['prometheus', 'node-exporter', 'alertmanager']: - diff = list(set(last_deps) - set(deps)) + diff = list(set(last_deps).symmetric_difference(set(deps))) if any('secure_monitoring_stack' in e for e in diff): action = 'redeploy' elif dd.daemon_type == 'jaeger-agent': diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index 1c152f31731..f1244270672 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -1418,7 +1418,6 @@ spec: "deploy_arguments": [], "params": { 'tcp_ports': [4200, 9094], - 'reconfig': True, }, "meta": { 'service_name': 'alertmanager', @@ -1432,7 +1431,7 @@ spec: }, "config_blobs": {}, }), - use_current_daemon_image=True, + use_current_daemon_image=False, ) -- 2.39.5