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 <[email protected]>

Author: rkachach

src/pybind/mgr/cephadm/serve.py

@@ -1093,7 +1093,7 @@ def _check_daemons(self) -> None:
                 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':

src/pybind/mgr/cephadm/tests/test_services.py

@@ -1418,7 +1418,6 @@ def test_monitoring_ports(self, _run_cephadm, cephadm_module: CephadmOrchestrato
                             "deploy_arguments": [],
                             "params": {
                                 'tcp_ports': [4200, 9094],
-                                'reconfig': True,
                             },
                             "meta": {
                                 'service_name': 'alertmanager',
@@ -1432,7 +1431,7 @@ def test_monitoring_ports(self, _run_cephadm, cephadm_module: CephadmOrchestrato
                             },
                             "config_blobs": {},
                         }),
-                        use_current_daemon_image=True,
+                        use_current_daemon_image=False,
                     )