init-radosgw: use radosgw --show-config-value to get config values

This way we get the correct default values, as reflected by radosgw
itself.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/init-radosgw b/src/init-radosgw
index 174620fa9ebda79828a24dfc2b11b7a1d7a8bf8a..a526441c3a0650e99e1eb96366e59259dc2591ea 100644 (file)
--- a/src/init-radosgw
+++ b/src/init-radosgw
@@ -41,7 +41,7 @@ case "$1" in
             fi
 
             # is the socket defined?  if it's not, this instance shouldn't run as a daemon.
-            rgw_socket=`ceph-conf -n $name 'rgw socket path'`
+            rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path`
             if [ -z "$rgw_socket" ]; then
                 continue
             fi
@@ -57,7 +57,7 @@ case "$1" in
                 user="$DEFAULT_USER"
             fi
 
-            log_file=`ceph-conf -n $name log_file`
+            log_file=`$RADOSGW -n $name --show-config-value log_file`
             if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
                 touch "$log_file"
                 chown $user $log_file

diff --git a/src/init-radosgw.sysv b/src/init-radosgw.sysv
index ed9d178d7a8645b1d0eb912e4609543a64602cd9..da80ae19be8d701a191895f6cfac9e6792b12a26 100644 (file)
--- a/src/init-radosgw.sysv
+++ b/src/init-radosgw.sysv
@@ -43,7 +43,7 @@ case "$1" in
             fi
 
             # is the socket defined?  if it's not, this instance shouldn't run as a daemon.
-            rgw_socket=`ceph-conf -n $name 'rgw socket path'`
+            rgw_socket=`$RADOSGW -n $name --show-config-value rgw_socket_path`
             if [ -z "$rgw_socket" ]; then
                 continue
             fi
@@ -59,7 +59,7 @@ case "$1" in
                 user="$DEFAULT_USER"
             fi
 
-            log_file=`ceph-conf -n $name log_file`
+            log_file=`$RADOSGW -n $name --show-config-value log_file`
             if [ -n "$log_file" ] && [ ! -e "$log_file" ]; then
                 touch "$log_file"
                 chown $user $log_file