From b1399324fbeaaffba7d999d938ecd3dbe9c260f5 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 11 May 2023 11:07:53 -0400 Subject: [PATCH] mgr/cephadm: deploy using deploy-from command The new `deploy-from` command aims to be a cleaner, clearer way to pass input to cephadm for service deployment. Make a minimal set of change to use that new command. Signed-off-by: John Mulligan --- src/pybind/mgr/cephadm/serve.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/pybind/mgr/cephadm/serve.py b/src/pybind/mgr/cephadm/serve.py index 58c7490d5af..1e033020563 100644 --- a/src/pybind/mgr/cephadm/serve.py +++ b/src/pybind/mgr/cephadm/serve.py @@ -1268,10 +1268,16 @@ class CephadmServe: daemon_spec.name(), daemon_spec.host)) out, err, code = await self._run_cephadm( - daemon_spec.host, daemon_spec.name(), 'deploy', - [ - '--name', daemon_spec.name(), - '--meta-json', json.dumps({ + daemon_spec.host, + daemon_spec.name(), + ['_orch', 'deploy'], + [], + stdin=json.dumps({ + "fsid": self.mgr._cluster_fsid, + "name": daemon_spec.name(), + "image": image, + "deploy_arguments": daemon_spec.extra_args, + "meta": { 'service_name': daemon_spec.service_name, 'ports': daemon_spec.ports, 'ip': daemon_spec.ip, @@ -1280,11 +1286,9 @@ class CephadmServe: 'rank_generation': daemon_spec.rank_generation, 'extra_container_args': extra_container_args, 'extra_entrypoint_args': extra_entrypoint_args - }), - '--config-json', '-', - ] + daemon_spec.extra_args, - stdin=json.dumps(daemon_spec.final_config), - image=image, + }, + "config_blobs": daemon_spec.final_config, + }), ) if daemon_spec.daemon_type == 'agent': -- 2.39.5