From 42b1dd2e935bdbca877e26d150a27bdc651a55af Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Sun, 15 Mar 2020 10:12:07 -0500 Subject: [PATCH] cephadm: write output files to /etc/ceph by default This streamlines the install for most users by putting the config and keyring files in /etc/ceph, where other ceph CLI commands will find them. The cost is making isolated installs a bit more painful, by requiring that users specify a local location for --output-config etc. Signed-off-by: Sage Weil --- src/cephadm/cephadm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 4a8e7bcc1c997..93830d0beabaf 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3874,15 +3874,15 @@ def _get_parser(): help='cluster FSID') parser_bootstrap.add_argument( '--output-keyring', - default='ceph.client.admin.keyring', + default='/etc/ceph/ceph.client.admin.keyring', help='location to write keyring file with new cluster admin and mon keys') parser_bootstrap.add_argument( '--output-config', - default='ceph.conf', + default='/etc/ceph/ceph.conf', help='location to write conf file to connect to new cluster') parser_bootstrap.add_argument( '--output-pub-ssh-key', - default='ceph.pub', + default='/etc/ceph/ceph.pub', help='location to write the cluster\'s public SSH key') parser_bootstrap.add_argument( '--skip-ssh', -- 2.39.5