core: remove newlines from liveness probe scripts
Strip unnecessary leading and trailing newlines from osdLivenessProbeScript and livenessProbeScript raw string literals in spec.go
Signed-off-by: Santosh <sapillai@redhat.com>
(cherry picked from commit 925acb3e92)
This commit is contained in:
1 parent
2fb3f54c73
commit
c2cf45e716
1 file changed
+4
-8
@@ -82,25 +82,21 @@ type daemonConfig struct {
|
||||
var logger = capnslog.NewPackageLogger("github.com/rook/rook", "ceph-spec")
|
||||
|
||||
var (
|
||||
osdLivenessProbeScript = `
|
||||
outp="$(ceph --admin-daemon %s %s 2>&1)"
|
||||
osdLivenessProbeScript = `outp="$(ceph --admin-daemon %s %s 2>&1)"
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ] && [ ! -f /tmp/osd-sleep ]; then
|
||||
echo "ceph daemon health check failed with the following output:"
|
||||
echo "$outp" | sed -e 's/^/> /g'
|
||||
exit $rc
|
||||
fi
|
||||
`
|
||||
fi`
|
||||
|
||||
livenessProbeScript = `
|
||||
outp="$(ceph --admin-daemon %s %s 2>&1)"
|
||||
livenessProbeScript = `outp="$(ceph --admin-daemon %s %s 2>&1)"
|
||||
rc=$?
|
||||
if [ $rc -ne 0 ]; then
|
||||
echo "ceph daemon health check failed with the following output:"
|
||||
echo "$outp" | sed -e 's/^/> /g'
|
||||
exit $rc
|
||||
fi
|
||||
`
|
||||
fi`
|
||||
|
||||
cronLogRotate = `
|
||||
CEPH_CLIENT_ID=%s
|
||||
|
||||
Reference in new issue
Block a user