Merge "Fix gnocchi_statsd and ceilometer_agent_ipmi healthcheck"

openstack-archive · Jul 18, 2018 · e8d2fcd · e8d2fcd
2 parents 1e7262d + 218065b
commit e8d2fcd
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/healthcheck/ceilometer-agent-ipmi b/healthcheck/ceilometer-agent-ipmi
@@ -3,12 +3,12 @@
 . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
 
 process='ceilometer-polling'
-args="${@:-5671 5672}"
+args="${@:-6379}"
 
 if healthcheck_port $process $args; then
   exit 0
 else
   ports=${args// /,}
-  echo "There is no $process process with opened RabbitMQ ports ($ports) running in the container"
+  echo "There is no $process process with opened Redis ports ($ports) running in the container"
   exit 1
 fi
diff --git a/healthcheck/gnocchi-statsd b/healthcheck/gnocchi-statsd
@@ -3,12 +3,9 @@
 . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
 
 process='gnocchi-statsd'
-args="${@:-6379}"
+bind_port=$(get_config_val /etc/gnocchi/gnocchi.conf statsd port 8125)
 
-if healthcheck_port $process $args; then
-  exit 0
-else
-  ports=${args// /,}
-  echo "There is no $process process with opened Redis ports ($ports) running in the container"
+if ! healthcheck_listen $process $bind_port; then
+  echo "There is no $process process listening on ports $bind_port in the container."
   exit 1
 fi