]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #48074 from adk3798/client-removal-fixing
authorAdam King <47704447+adk3798@users.noreply.github.com>
Wed, 7 Dec 2022 15:37:31 +0000 (10:37 -0500)
committerGitHub <noreply@github.com>
Wed, 7 Dec 2022 15:37:31 +0000 (10:37 -0500)
mgr/cephadm: write client files after applying services

Reviewed-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Michael Fritch <mfritch@suse.com>
1  2 
src/pybind/mgr/cephadm/serve.py
src/pybind/mgr/cephadm/tests/test_cephadm.py

index 9f0bbb40d17a47ed3459331e142b358e355a3eb9,27c21eddc0f417bacedbd29da45d22f8118a9888..3248db4500bfb1146f4e6fb5107f38be4249f566
@@@ -303,12 -262,11 +297,12 @@@ class CephadmServe
                  self.log.debug(f"autotuning memory for {host}")
                  self._autotune_host_memory(host)
  
-             self._write_client_files(client_files, host)
          refresh(self.mgr.cache.get_hosts())
  
+         self._write_all_client_files()
          self.mgr.agent_helpers._update_agent_down_healthcheck(agents_down)
 +        self.mgr.http_server.config_update()
  
          self.mgr.config_checker.run_checks()