diff options
| author | Matthew Sackman <matthew@lshift.net> | 2010-03-11 17:58:57 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2010-03-11 17:58:57 +0000 |
| commit | cbc1e6f982cdd356a805f5d60525f750baf725ab (patch) | |
| tree | 3839780eaa43600d303dedde35ce9c3cb1eefec1 | |
| parent | e40fb90567839f610cc3a2b0c01e3ac2163b983f (diff) | |
| download | rabbitmq-server-cbc1e6f982cdd356a805f5d60525f750baf725ab.tar.gz | |
Getting there. Still doesn't really work in anger though...
| -rw-r--r-- | packaging/common/rabbitmq-server.ocf | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/packaging/common/rabbitmq-server.ocf b/packaging/common/rabbitmq-server.ocf index c788f1cc..dbc7e531 100644 --- a/packaging/common/rabbitmq-server.ocf +++ b/packaging/common/rabbitmq-server.ocf @@ -84,7 +84,6 @@ The path to the rabbitmq-multi script <content type="string" default="${OCF_RESKEY_multi_default}" /> </parameter> -<parameters> <parameter name="crt" unique="0" required="0"> <longdesc lang="en"> The path to the rabbitmqctl script @@ -93,7 +92,6 @@ The path to the rabbitmqctl script <content type="string" default="${OCF_RESKEY_ctl_default}" /> </parameter> -<parameters> <parameter name="nodename" unique="0" required="0"> <longdesc lang="en"> The node name for rabbitmq-server @@ -204,32 +202,32 @@ export \ rabbit_validate() { if [ ! -x $RABBITMQ_MULTI ]; then ocf_log err "rabbitmq-server multi $RABBITMQ_MULTI does not exist or is not executable"; - return $OCF_ERR_INSTALLED; + return $OCF_ERR_ARGS; fi if [ ! -x $RABBITMQ_CTL ]; then ocf_log err "rabbitmq-server ctl $RABBITMQ_CTL does not exist or is not executable"; - return $OCF_ERR_INSTALLED; + return $OCF_ERR_ARGS; fi if [ ! -z $RABBITMQ_CLUSTER_CONFIG_FILE ] && [ ! -a $RABBITMQ_CLUSTER_CONFIG_FILE ]; then ocf_log err "rabbitmq-server cluster_config_file $RABBITMQ_CLUSTER_CONFIG_FILE does not exist or is not a file"; - return $OCF_ERR_CONFIGURED; + return $OCF_ERR_ARGS; fi if [ ! -z $RABBITMQ_CONFIG_FILE ] && [ ! -a $RABBITMQ_CONFIG_FILE ]; then ocf_log err "rabbitmq-server config_file $RABBITMQ_CONFIG_FILE does not exist or is not a file"; - return $OCF_ERR_CONFIGURED; + return $OCF_ERR_ARGS; fi if [ ! -z $RABBITMQ_LOG_BASE ] && [ ! -d $RABBITMQ_LOG_BASE ]; then ocf_log err "rabbitmq-server log_base $RABBITMQ_LOG_BASE does not exist or is not a directory"; - return $OCF_ERR_CONFIGURED; + return $OCF_ERR_ARGS; fi if [ ! -z $RABBITMQ_MNESIA_BASE ] && [ ! -d $RABBITMQ_MNESIA_BASE ]; then ocf_log err "rabbitmq-server mnesia_base $RABBITMQ_MNESIA_BASE does not exist or is not a directory"; - return $OCF_ERR_CONFIGURED; + return $OCF_ERR_ARGS; fi return $OCF_SUCCESS @@ -307,11 +305,11 @@ rabbit_stop() { ocf_log info "rabbitmq-server stopped" return $OCF_SUCCESS - } rabbit_monitor() { rabbit_status + return $? } case $__OCF_ACTION in |