Tree - rpms/resource-agents - CentOS Git server

Blob History Raw

		bb196a	`diff -uNr a/heartbeat/docker b/heartbeat/docker`
		bb196a	`--- a/heartbeat/docker 2017-11-01 13:46:00.935405714 +0100`
		bb196a	`+++ b/heartbeat/docker 2017-11-01 13:54:20.896006649 +0100`
		bb196a	`@@ -234,14 +234,16 @@`
		bb196a
		bb196a	`# retrieve the 'Running' attribute for the container`
		bb196a	`val=$(docker inspect --format {{.State.Running}} $CONTAINER 2>/dev/null)`
		bb196a	`- if [ $? -ne 0 ]; then`
		bb196a	`- #not running as a result of container not being found`
		bb196a	`- return $OCF_NOT_RUNNING`
		bb196a	`+ if [ $? -eq 0 ]; then`
		bb196a	`+ if ocf_is_true "$val"; then`
		bb196a	`+ # container exists and is running`
		bb196a	`+ return $OCF_SUCCESS`
		bb196a	`+ fi`
		bb196a	`fi`
		bb196a
		bb196a	`- if ocf_is_true "$val"; then`
		bb196a	`- # container exists and is running`
		bb196a	`- return $OCF_SUCCESS`
		bb196a	`+ # Known but in a stopped state`
		bb196a	`+ if ! ocf_is_true "$OCF_RESKEY_reuse"; then`
		bb196a	`+ return $OCF_ERR_GENERIC`
		bb196a	`fi`
		bb196a
		bb196a	`return $OCF_NOT_RUNNING`