On Tue, Jun 03, 2014 at 10:02:12AM +0200, Klaus Aehlig wrote: > noded is designed to live on a normal node and hence > will not depend on any other daemon. In particular, it > is safe to start this daemon first. Starting it after > wconfd also allows wconfd to carry out a full voting. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > daemons/daemon-util.in | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-)
Sorry, I missed that the output was hard-coded in a test. So I suggest the following patch. commit 118b8a672bda47ed3e377354592cd4e8ea0a09e6 Author: Klaus Aehlig <[email protected]> Date: Tue Jun 3 09:42:47 2014 +0200 Start noded before wconfd noded is designed to live on a normal node and hence will not depend on any other daemon. In particular, it is safe to start this daemon first. Starting it after wconfd also allows wconfd to carry out a full voting. diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in index a77f1d3..88479db 100644 --- a/daemons/daemon-util.in +++ b/daemons/daemon-util.in @@ -28,8 +28,8 @@ readonly defaults_file="$SYSCONFDIR/default/ganeti" # order is important as there are dependencies between them. On shutdown, # they're stopped in reverse order. DAEMONS=( - ganeti-wconfd ganeti-noded + ganeti-wconfd ganeti-rapi ganeti-luxid ) diff --git a/test/py/daemon-util_unittest.bash b/test/py/daemon-util_unittest.bash index 07fe1b0..da1191d 100755 --- a/test/py/daemon-util_unittest.bash +++ b/test/py/daemon-util_unittest.bash @@ -36,7 +36,7 @@ if ! grep -q '^ENABLE_MOND = ' lib/_constants.py; then err "Please update $0, mond enable feature is missing" fi -DAEMONS_LIST="wconfd noded rapi luxid" +DAEMONS_LIST="noded wconfd rapi luxid" STOPDAEMONS_LIST="luxid rapi noded wconfd" if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then -- Klaus Aehlig Google Germany GmbH, Dienerstr. 12, 80331 Muenchen Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
