From f9d285f632b14f2e79babccb15a61da1514ba510 Mon Sep 17 00:00:00 2001 From: Kiefer Chang Date: Tue, 3 Mar 2020 11:28:53 +0800 Subject: [PATCH] cephadm: fix failure when getting keyring for deploying daemons Fixes: https://tracker.ceph.com/issues/44390 Signed-off-by: Kiefer Chang --- src/cephadm/cephadm | 2 +- src/pybind/mgr/cephadm/module.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 5b8dda922d9..5439fdcaec2 100755 --- 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 1093677b513..ab0b7accf95 100644 --- 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': -- 2.39.5