diff --git a/ceph/ceph/files/ceph.sh b/ceph/ceph/files/ceph.sh old mode 100755 new mode 100644 index 926eb0559..e7e6ecd1f --- a/ceph/ceph/files/ceph.sh +++ b/ceph/ceph/files/ceph.sh @@ -22,40 +22,30 @@ logecho () start () { - if [[ "$nodetype" == "controller" ]] || [[ "$nodetype" == "storage" ]]; then - logecho "Starting ceph services..." - ${INITDIR}/ceph start >> ${LOGFILE} 2>&1 - RC=$? + logecho "Starting ceph services..." + ${INITDIR}/ceph start >> ${LOGFILE} 2>&1 + RC=$? - if [ ! -f ${CEPH_FILE} ]; then - touch ${CEPH_FILE} - fi - else - logecho "No ceph services on ${nodetype} node" - exit 0 + if [ ! -f ${CEPH_FILE} ]; then + touch ${CEPH_FILE} fi } stop () { - if [[ "$nodetype" == "controller" ]] || [[ "$nodetype" == "storage" ]]; then - if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" == "simplex" ]]; then - logecho "Ceph services will continue to run on node" - exit 0 - fi - - logecho "Stopping ceph services..." - - if [ -f ${CEPH_FILE} ]; then - rm -f ${CEPH_FILE} - fi - - ${INITDIR}/ceph stop >> ${LOGFILE} 2>&1 - RC=$? - else - logecho "No ceph services on ${nodetype} node" + if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" == "simplex" ]]; then + logecho "Ceph services will continue to run on node" exit 0 fi + + logecho "Stopping ceph services..." + + if [ -f ${CEPH_FILE} ]; then + rm -f ${CEPH_FILE} + fi + + ${INITDIR}/ceph stop >> ${LOGFILE} 2>&1 + RC=$? } RC=0