openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Use the correct socket file for the Ceph mon check."

Browse Source
This commit is contained in:
Zuul 2018-10-22 20:03:47 +00:00 committed by Gerrit Code Review
commit 19e7e0fb61
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceph-mon/templates/bin/mon/_check.sh.tpl
View File

@ -36,7 +36,7 @@ function heath_check () {
fi
if [ -S "${SOCKDIR}/${SBASE}.${MON_NAME}.${SSUFFIX}" ]; then
MON_STATE=$(ceph -f json-pretty --connect-timeout 1 --admin-daemon "${sock}" mon_status|grep state|sed 's/.*://;s/[^a-z]//g')
MON_STATE=$(ceph -f json-pretty --connect-timeout 1 --admin-daemon "${SOCKDIR}/${SBASE}.${MON_NAME}.${SSUFFIX}" mon_status|grep state|sed 's/.*://;s/[^a-z]//g')
echo "MON ${MON_ID} ${MON_STATE}";
# this might be a stricter check than we actually want. what are the
# other values for the "state" field?