From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Thu, 9 Oct 2014 14:19:56 +0000 (-0400)
Subject: create a mon keyring in a helper function
X-Git-Tag: v1.5.18~4^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd3f6bd67e74bb3177ad3e7094cc034e64cae3cd;p=ceph-deploy.git

create a mon keyring in a helper function

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/new.py b/ceph_deploy/new.py
index 87c6886..902e87d 100644
--- a/ceph_deploy/new.py
+++ b/ceph_deploy/new.py
@@ -189,13 +189,7 @@ def new(args):
         name=args.cluster,
         )
 
-    # FIXME: create a random key
-    LOG.debug('Creating a random mon key...')
-    mon_keyring = '[mon.]\nkey = %s\ncaps mon = allow *\n' % generate_auth_key()
-
-    keypath = '{name}.mon.keyring'.format(
-        name=args.cluster,
-        )
+    new_mon_keyring(args)
 
     LOG.debug('Writing initial config to %s...', path)
     tmp = '%s.tmp' % path
@@ -209,6 +203,15 @@ def new(args):
         else:
             raise
 
+
+def new_mon_keyring(args):
+    LOG.debug('Creating a random mon key...')
+    mon_keyring = '[mon.]\nkey = %s\ncaps mon = allow *\n' % generate_auth_key()
+
+    keypath = '{name}.mon.keyring'.format(
+        name=args.cluster,
+        )
+
     LOG.debug('Writing monitor keyring to %s...', keypath)
     tmp = '%s.tmp' % keypath
     with file(tmp, 'w') as f: