From 3160e8d6918a04d1fec9fdccbc30bf007c7940c6 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 18 Mar 2015 20:55:24 -0700 Subject: [PATCH] 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 Signed-off-by: Yehuda Sadeh (cherry picked from commit 6823bcdcd0ce72cd223e809291f46d82da76115c) --- src/init-radosgw | 6 ------ src/init-radosgw.sysv | 6 ------ 2 files changed, 12 deletions(-) diff --git a/src/init-radosgw b/src/init-radosgw index c38ddad616e57..c721870d30c6b 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 2486539af36d6..e3b7d93b4cb7f 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` -- 2.39.5