starlingx/integ
Code Issues Proposed changes

ceph: mtc process management improvement

Browse Source 
These commits were lost accidentally when StarlingX code
was migrated from stx-ceph (ceph jewel version) repository
to stx-integ:

* keep Ceph up when locking a 1 node configuration

    On 1 node configration we need ceph to be operational when
    node is locked otherwise sysinv will give errors when trying
    to configure it.
    Implements:
    containerization-2002844-CEPH-persistent-storage-backend-for-Kubernetes

    Story: 2002844
    Task: 26877

* enable MTC management of Ceph proceses on worker nodes

    Worker nodes may now have a ceph monitor enabled, so remove checks
    preventing it and make sure that ceph.sh is present in /etc/system.d/worker/.
    Origin patch: https://github.com/starlingx-staging/stx-ceph/
                  commit/4fa893a39b4025957f9725d3f75ea502d081ea76

Depends-On: Ibe104b32f568bb59a02b84c255983323d5d14757
Change-Id: Ifd7e6876b853f5629195451a0c4af240d40ebee8
Signed-off-by: Ovidiu Poncea <Ovidiu.Poncea@windriver.com>
Signed-off-by: Daniel Badea <daniel.badea@windriver.com>
This commit is contained in:
Ovidiu Poncea 2019-03-28 16:55:14 +00:00 committed by Daniel Badea
parent 233698ac52
commit d7dd9cf6a4
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
ceph/ceph/files/ceph.sh Executable file → Normal file
View File

@ -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