Update 'daemons/daemon-util' to stop 'ganeti-metad'

* Add 'ganeti-metad' to list of daemons to stop
* Update 'daemon-util' test

Note that 'ganeti-metad' is not automatically started together with
all the other daemons.  Instead, 'ganeti-metad' is only started when
it is necessary.  Nevertheless, it is stopped together with the other
daemons.
Signed-off-by: Jose A. Lopes <jabolopes@google.com>
Reviewed-by: Hrvoje Ribicic <riba@google.com>

daemons/daemon-util.in

@@ -31,6 +31,7 @@ DAEMONS=(
   ganeti-wconfd
   ganeti-noded
   ganeti-masterd
+  ganeti-metad
   ganeti-rapi
   ganeti-luxid
   )
@@ -174,13 +175,17 @@ list_start_daemons() {
   local name
 
   for name in "${DAEMONS[@]}"; do
-    echo "$name"
+    if [[ "$name" != ganeti-metad ]]; then
+      echo "$name"
+    fi
   done
 }
 
 # Prints a list of all daemons in the order in which they should be stopped
 list_stop_daemons() {
-  list_start_daemons | tac
+  for name in "${DAEMONS[@]}"; do
+    echo "$name"
+  done | tac
 }
 
 # Checks whether a daemon name is known

test/py/daemon-util_unittest.bash

@@ -37,7 +37,7 @@ if ! grep -q '^ENABLE_MOND = ' lib/_constants.py; then
 fi
 
 DAEMONS_LIST="wconfd noded masterd rapi luxid"
-STOPDAEMONS_LIST="luxid rapi masterd noded wconfd"
+STOPDAEMONS_LIST="luxid rapi metad masterd noded wconfd"
 
 if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then
   DAEMONS_LIST="$DAEMONS_LIST confd"