Always prefix RGW daemons wth 'rgw.'

If a user specifics a custom RGW daemon name, automatically prefix it
with 'rgw.'

Fixes: http://tracker.ceph.com/issues/11561
Signed-off-by: Travis Rhoden <trhoden@redhat.com>

diff --git a/ceph_deploy/rgw.py b/ceph_deploy/rgw.py
index 7364efc75fe15c7725846d620e03e4d0f985d188..a01f3eeb8196fe8b57704fd5bc9546e6c4f130ef 100644 (file)
--- a/ceph_deploy/rgw.py
+++ b/ceph_deploy/rgw.py
@@ -176,9 +176,10 @@ def rgw(args):
 
 def colon_separated(s):
     host = s
-    name = 'rgw.' + s
+    name = s
     if s.count(':') == 1:
         (host, name) = s.split(':')
+    name = 'rgw.' + name
     return (host, name)
 
 
@@ -200,7 +201,8 @@ def make(parser):
         metavar='HOST[:NAME]',
         nargs='*',
         type=colon_separated,
-        help='host (and optionally the daemon name) to deploy on',
+        help='host (and optionally the daemon name) to deploy on. \
+                NAME is automatically prefixed with \'rgw.\'',
         )
     parser.set_defaults(
         func=rgw,