diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-05-24 17:48:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-24 17:48:48 +0000 |
| commit | 1830fc7e047319cc28e74ea315ce2a5653d59af3 (patch) | |
| tree | e76d34ff95abab98ac8b6b76b351d24a30edb3cc /kubernetes/consul/resources/config/consul-agent-config/scripts | |
| parent | 6dc7ceec8eaec23bc717e9c54dba6410804024a8 (diff) | |
| parent | 9eb4adc754e6f8da4cc7ed2f2facebf544593cb3 (diff) | |
Merge "Consul Health Check changes for MessageRouter"
Diffstat (limited to 'kubernetes/consul/resources/config/consul-agent-config/scripts')
| -rwxr-xr-x | kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh | 2 | ||||
| -rwxr-xr-x | kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh index fd4587551d..4be0a24851 100755 --- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh +++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh @@ -1,4 +1,4 @@ -kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-kafka-[^[:space:]]*") +kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-kafka-[^[:space:]]*") if [ -n "$kafkapod" ]; then if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $kafkapod -- ps ef | grep -i kafka; then echo Success. Kafka process is running. 2>&1 diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh index fb34057bfc..f8f40b9f83 100755 --- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh +++ b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh @@ -1,6 +1,6 @@ -zkpod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "message-router-zookeeper-[^[:space:]]*") +zkpod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-zookeeper-[^[:space:]]*") if [ -n "$zkpod" ]; then - if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $zkpod -- ps ef | grep -i zookeeper; then + if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $zkpod -- ps aux | grep -i zookeeper; then echo Success. Zookeeper process is running. 2>&1 exit 0 else |