From: Sage Weil <sage@redhat.com>
Date: Tue, 14 Mar 2017 02:20:28 +0000 (-0400)
Subject: mds: remove weird key creation cruft
X-Git-Tag: v1.5.38~5^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=156c8b42bc7d5302eaa4ff80fa0c0f12234a32d4;p=ceph-deploy.git

mds: remove weird key creation cruft

First, don't ignore EACCES.  And remove the weird legacy case that is dead
code.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/ceph_deploy/mds.py b/ceph_deploy/mds.py
index b681528..f4aabc7 100644
--- a/ceph_deploy/mds.py
+++ b/ceph_deploy/mds.py
@@ -1,4 +1,3 @@
-import errno
 import logging
 import os
 
@@ -56,7 +55,7 @@ def create_mds(distro, name, cluster, init):
             os.path.join(keypath),
         ]
     )
-    if returncode > 0 and returncode != errno.EACCES:
+    if returncode > 0:
         for line in stderr:
             conn.logger.error(line)
         for line in stdout:
@@ -65,22 +64,6 @@ def create_mds(distro, name, cluster, init):
         conn.logger.error('exit code from command was: %s' % returncode)
         raise RuntimeError('could not create mds')
 
-        remoto.process.check(
-            conn,
-            [
-                'ceph',
-                '--cluster', cluster,
-                '--name', 'client.bootstrap-mds',
-                '--keyring', bootstrap_keyring,
-                'auth', 'get-or-create', 'mds.{name}'.format(name=name),
-                'osd', 'allow *',
-                'mds', 'allow',
-                'mon', 'allow rwx',
-                '-o',
-                os.path.join(keypath),
-            ]
-        )
-
     conn.remote_module.touch_file(os.path.join(path, 'done'))
     conn.remote_module.touch_file(os.path.join(path, init))