From: Travis Rhoden <trhoden@redhat.com>
Date: Tue, 17 Mar 2015 19:01:16 +0000 (-0400)
Subject: Make missing RGW bootstrap key non-fatal
X-Git-Tag: v1.5.23~11^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c1b280f0807d21901baa90391049e6fdc99c7575;p=ceph-deploy.git

Make missing RGW bootstrap key non-fatal

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/ceph_deploy/gatherkeys.py b/ceph_deploy/gatherkeys.py
index c2f9ebb..bd85662 100644
--- a/ceph_deploy/gatherkeys.py
+++ b/ceph_deploy/gatherkeys.py
@@ -69,7 +69,11 @@ def gatherkeys(args):
             _hosts=args.mon,
             )
         if not r:
-            raise exc.KeyNotFoundError(keyring, args.mon)
+            if what in ['osd', 'mds']:
+                raise exc.KeyNotFoundError(keyring, args.mon)
+            else:
+                LOG.warning(("No RGW bootstrap key found. Will not be able to "
+                             "deploy RGW daemons"))
 
 
 @priority(40)