From: Travis Rhoden <trhoden@redhat.com>
Date: Thu, 7 May 2015 20:04:43 +0000 (+0000)
Subject: Always prefix RGW daemons wth 'rgw.'
X-Git-Tag: v1.5.24~9^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=40fd8712893a78eb4a001746ea7b4164888bb049;p=ceph-deploy.git

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 7364efc..a01f3ee 100644
--- 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,