cephadm: fix failure when getting keyring for deploying daemons

Fixes: https://tracker.ceph.com/issues/44390
Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 5b8dda922d9ddc7c8b9721c600df47676bc61595..5439fdcaec242ea12e411334ac48297c4a8b395c 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3507,7 +3507,7 @@ def _get_parser():
         '--key',
         help='key for new daemon')
     parser_deploy.add_argument(
-        '--config-and-keyrings',
+        '--config-and-keyring',
         help='JSON file with config and keyrings for the daemon and crash agent')
     parser_deploy.add_argument(
         '--osd-fsid',

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 1093677b513412ce7940926838102e784af25346..ab0b7accf95e25cf192fd03b7ee6fe9a3764bcbc 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -2023,7 +2023,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                 'config': config,
                 'keyring': keyring,
             })
-            extra_args.extend(['--config-and-keyrings', '-'])
+            extra_args.extend(['--config-and-keyring', '-'])
 
             # osd deployments needs an --osd-uuid arg
             if daemon_type == 'osd':