Don't return OCF_ERR_INSTALLED in the OCF script

OCF_ERR_INSTALLED is considered by Pacemaker as a hard error meaning
that it won't try to restart the resource. When deploying the
collectors, the configuration may not be ready at the same time on all
the nodes.

Change-Id: I878d38747e9b84bfebb8e605cb01510c70cf8633
Closes-Bug: #1593137
This commit is contained in:
Simon Pasquier 2016-06-22 17:10:48 +02:00
parent 5c369ee965
commit 97a3c6dfa9
1 changed files with 2 additions and 2 deletions

View File

@ -156,14 +156,14 @@ service_validate() {
if [[ ! -f $OCF_RESKEY_config && ! -d $OCF_RESKEY_config ]]; then
ocf_log err "Config $OCF_RESKEY_config doesn't exist"
return "$OCF_ERR_INSTALLED"
return "$OCF_ERR_GENERIC"
fi
getent passwd "$OCF_RESKEY_user" >/dev/null 2>&1
rc=$?
if [ $rc -ne 0 ]; then
ocf_log err "User $OCF_RESKEY_user doesn't exist"
return "$OCF_ERR_INSTALLED"
return "$OCF_ERR_GENERIC"
fi
true