From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 19 Mar 2015 03:55:24 +0000 (-0700)
Subject: init-radosgw*: don't require rgw_socket_path to be defined
X-Git-Tag: v0.80.10~40
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3160e8d6918a04d1fec9fdccbc30bf007c7940c6;p=ceph.git

init-radosgw*: don't require rgw_socket_path to be defined

Fixes: #11159
Backport: hammer, firefly

Scripts required rgw_socket_path to exist in order to start radosgw.
This is not needed.

Reported-by: Dan Mick <dmick@redhat.com>
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c)
---

diff --git a/src/init-radosgw b/src/init-radosgw
index c38ddad616e..c721870d30c 100644
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -52,12 +52,6 @@ case "$1" in
                 continue
             fi
 
-            # is the socket defined?  if it's not, this instance shouldn't run as a daemon.
-            rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path`
-            if [ -z "$rgw_socket" ]; then
-                continue
-            fi
-
             # mapped to this host?
             host=`ceph-conf -n $name host`
             hostname=`hostname -s`
diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv
index 2486539af36..e3b7d93b4cb 100644
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@ -59,12 +59,6 @@ case "$1" in
                 continue
             fi
 
-            # is the socket defined?  if it's not, this instance shouldn't run as a daemon.
-            rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path`
-            if [ -z "$rgw_socket" ]; then
-                continue
-            fi
-
             # mapped to this host?
             host=`ceph-conf -n $name host`
             hostname=`hostname -s`