Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 670066 | Differences between
and this patch

Collapse All | Expand All

(-)a/sys-cluster/ceph/files/ceph.confd-r1 (+11 lines)
Lines 2-4 Link Here
2 

          2
          

        

        

          3
          
# default ceph conf file

          3
          
# default ceph conf file

        

        

          4
          
#ceph_conf="/etc/ceph/ceph.conf"

          4
          
#ceph_conf="/etc/ceph/ceph.conf"

        

            

              
              
              5
              

            

            

              6
              
# Set RADOSGW_WANT_NAME_PARAM=y in order to make the init script add

            

            

              7
              
# a --name=client.${RC_SVCNAME} parameter to command_args for radosgw.*

            

            

              8
              
# service instances. This will make the service use a key by the name

            

            

              9
              
# of client.${RC_SVCNAME} instead of the default client.admin key.

            

            

              10
              
# A setting like this in the ceph config file can be used to customize

            

            

              11
              
# the rgw_data and keyring paths used by radosgw instances:

            

            

              12
              
# [client]

            

            

              13
              
# rgw_data = /var/lib/ceph/radosgw/$cluster-$id

            

            

              14
              
# keyring = /var/lib/ceph/radosgw/$cluster-$id/keyring

            

            

              15
              
RADOSGW_WANT_NAME_PARAM=n

            



(-)a/sys-cluster/ceph/files/ceph.initd-r8
      (-1 / +4 lines)




  

    
      
            Lines 18-23
          command="/usr/bin/${RC_SVCNAME%%.*}"
      
      
        Link Here
      
    
  

        

          18
          
command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"

          18
          
command_args="-i ${daemon_id} --pid-file ${daemon_pidfile} -c ${ceph_conf}"

        

        

          19
          
command_args_foreground="--foreground"

          19
          
command_args_foreground="--foreground"

        

        

          20
          

          20
          

        

            

              
              
              21
              
if [ ${daemon_type} = radosgw ] && [ ${RADOSGW_WANT_NAME_PARAM} = y ]; then

            

            

              22
              
	command_args="${command_args} --name client.${daemon_id}"

            

            

              23
              
fi

            

            

              24
              

            

        

          21
          
retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"

          25
          
retry="${CEPH_TERMTIMEOUT:-TERM/120/KILL/5}"

        

        

          22
          
start_stop_daemon_args="--user ${user} --group ${group}"

          26
          
start_stop_daemon_args="--user ${user} --group ${group}"

        

        

          23
          
supervise_daemon_args="--user ${user} --group ${group}"

          27
          
supervise_daemon_args="--user ${user} --group ${group}"

        

            

              24
              
- 

              
              
            






  

  Return to bug 670066