From 019ebaef0ed555dffa49be85a39ecd6c1d3244e1 Mon Sep 17 00:00:00 2001
From: Victor Seva <vseva@sipwise.com>
Date: Mon, 11 Jan 2016 18:05:03 +0100
Subject: [PATCH] MT#17163 services: restart ha.d after monit and before the
 rest

Change-Id: Idfa93e80d2e5c6420080cdf67bbf6b6fe8f78212
(cherry picked from commit 8784b368dd38c31a17dd4c30eec98902bfd578c9)
---
 scripts/services | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/services b/scripts/services
index c7e1b69f..192ea8dc 100755
--- a/scripts/services
+++ b/scripts/services
@@ -108,12 +108,18 @@ normalize_files() {
 }
 
 # restart monit services before the rest (see MT#9971)
+# restart HA just after monit (see MT#17163)
 sort_service_list() {
   SORTED_LIST="$(mktemp)"
   log_debug "SORTED_LIST = $SORTED_LIST"
 
-  grep    '/etc/ngcp-config/templates/etc/monit/.*services' "${NORMALIZED_FILES}" > "${SORTED_LIST}" || true
-  grep -v '/etc/ngcp-config/templates/etc/monit/.*services' "${NORMALIZED_FILES}" >> "${SORTED_LIST}" || true
+  grep "${SERVICES_POOL_BASE}"/etc/monit/'.*services' "${NORMALIZED_FILES}" > \
+    "${SORTED_LIST}" || true
+  grep "${SERVICES_POOL_BASE}"/etc/ha.d/'.*services' "${NORMALIZED_FILES}" >> \
+    "${SORTED_LIST}" || true
+  grep -v "${SERVICES_POOL_BASE}"/etc/monit/'.*services' "${NORMALIZED_FILES}"| \
+    grep -v "${SERVICES_POOL_BASE}"/etc/ha.d/'.*services' >> \
+    "${SORTED_LIST}" || true
 }
 
 execute() {