From: Sage Weil <sage@redhat.com>
Date: Sun, 15 Mar 2020 15:12:07 +0000 (-0500)
Subject: cephadm: write output files to /etc/ceph by default
X-Git-Tag: v15.2.0~43^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=42b1dd2e935bdbca877e26d150a27bdc651a55af;p=ceph.git

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 <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 4a8e7bcc1c9..93830d0beab 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',