From 66b93a324f803a96658b3e4dc7149d71cc7391be Mon Sep 17 00:00:00 2001 From: Joshua Schmid Date: Tue, 12 May 2020 12:07:45 +0200 Subject: [PATCH] mgr/cephadm: adapt env_var handling Signed-off-by: Joshua Schmid (cherry picked from commit 6d7a65f2936c6e92330aeb466b28638c33a80e13) --- src/pybind/mgr/cephadm/module.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index 7d6554175c1f3..ac63bb8ed4ff3 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -851,10 +851,13 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): stdin=None, no_fsid=False, error_ok=False, - image=None): - # type: (str, Optional[str], str, List[str], Optional[str], Optional[str], bool, bool, Optional[str]) -> Tuple[List[str], List[str], int] + image=None, + env_vars=None): + # type: (str, Optional[str], str, List[str], Optional[str], Optional[str], bool, bool, Optional[str], Optional[List[str]]) -> Tuple[List[str], List[str], int] """ Run cephadm on the remote host with the given command + args + + :env_vars: in format -> [KEY=VALUE, ..] """ if not addr and host in self.inventory: addr = self.inventory.get_addr(host) @@ -886,6 +889,11 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule): self.log.debug('%s container image %s' % (entity, image)) final_args = [] + + if env_vars: + for env_var_pair in env_vars: + final_args.extend(['--env', env_var_pair]) + if image: final_args.extend(['--image', image]) final_args.append(command) -- 2.39.5