Skip to content

Commit

Permalink
Merge pull request #1416 from oalbrigt/Route-validate-fix
Browse files Browse the repository at this point in the history
Route: only validate for start and validate-all actions
  • Loading branch information
oalbrigt authored Oct 11, 2019
2 parents 0cc8708 + 444bdc4 commit 0725bb9
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions heartbeat/Route
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,8 @@ END
}

route_start() {
route_validate || exit $?

route_status
status=$?
if [ $status -eq $OCF_SUCCESS ]; then
Expand Down Expand Up @@ -313,8 +315,6 @@ for binary in ip grep; do
check_binary $binary
done

route_validate || exit $?

case $OCF_RESKEY_family in
ip4) addr_family="-4" ;;
ip6) addr_family="-6" ;;
Expand All @@ -334,7 +334,7 @@ status|monitor) route_status;;
reload) ocf_log info "Reloading..."
route_start
;;
validate-all) ;;
validate-all) route_validate;;
*) route_usage
exit $OCF_ERR_UNIMPLEMENTED
;;
Expand Down

0 comments on commit 0725bb9

Please sign in to comment.