21fd04f038
This reverts commit 750b562521.
Depending on the used procps version, the output of "ps -e" is width
limited and thus not matching the quite long process names. Using
"ps -ef" fixes this, along with a small hack in the piped grep to filter
out grep itself (pgrep itself is not working for this).
Removes swift-*-replicator because it does not seem to be used
anymore in any of the container build configurations.
This change removes the renames from the previous commit because they
are backwards incompatible depending on how the containers are built. We
use healthcheck from the openstack-tripleo-common-containers-base which
is a package. If this package does not have the new file names (or old
filenames) and the containers are built with a different version of
tripleo-common, the container builds fail. So let's skip renaming of
files so that we can deal with that as a separate issue as a whole.
Change-Id: I3e58de46835307d4332b34d22d2895e6382292dd
21 lines
745 B
Bash
Executable File
21 lines
745 B
Bash
Executable File
#!/bin/bash
|
|
|
|
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
|
|
|
|
conf=/etc/swift/container-server.conf
|
|
cache=/var/cache/swift/container.recon
|
|
|
|
if ps -ef | grep --quiet [s]wift-container-server; then
|
|
if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
|
|
echo "healthcheck is not available" >&2
|
|
exit 0
|
|
fi
|
|
|
|
# swift-container-server is still eventlet
|
|
bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1))
|
|
bind_port=$(get_config_val $conf DEFAULT bind_port 6001)
|
|
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck
|
|
elif ps -ef | grep --quiet [s]wift-container-replicator; then
|
|
check_swift_interval container-replicator
|
|
fi
|