From 021158306ef4ab82cf07684ce81e5c0d90817300 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 19 Jun 2013 19:38:17 -0700 Subject: [PATCH] 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 --- src/init-radosgw | 4 ++-- src/init-radosgw.sysv | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/init-radosgw b/src/init-radosgw index 174620fa9eb..a526441c3a0 100644 --- 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 ed9d178d7a8..da80ae19be8 100644 --- 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 -- 2.47.3