Revision 6b06efa7
b/daemons/daemon-util.in | ||
---|---|---|
31 | 31 |
ganeti-noded |
32 | 32 |
ganeti-masterd |
33 | 33 |
ganeti-rapi |
34 |
ganeti-luxid |
|
34 | 35 |
) |
35 | 36 |
|
36 | 37 |
_confd_enabled() { |
... | ... | |
39 | 40 |
|
40 | 41 |
if _confd_enabled; then |
41 | 42 |
DAEMONS+=( ganeti-confd ) |
42 |
DAEMONS+=( ganeti-luxid ) |
|
43 | 43 |
fi |
44 | 44 |
|
45 | 45 |
_mond_enabled() { |
... | ... | |
233 | 233 |
local usergroup=$(_daemon_usergroup $plain_name) |
234 | 234 |
local daemonexec=$(_daemon_executable $name) |
235 | 235 |
|
236 |
if ( [[ "$name" == ganeti-confd ]] || [[ "$name" == ganeti-luxid ]] ) \
|
|
236 |
if [[ "$name" == ganeti-confd ]] \
|
|
237 | 237 |
&& ! _confd_enabled; then |
238 | 238 |
echo 'ganeti-confd disabled at build time' >&2 |
239 | 239 |
return 1 |
... | ... | |
292 | 292 |
start_master() { |
293 | 293 |
start ganeti-masterd |
294 | 294 |
start ganeti-rapi |
295 |
if _confd_enabled; then |
|
296 |
start ganeti-luxid |
|
297 |
else |
|
298 |
return 0 |
|
299 |
fi |
|
295 |
start ganeti-luxid |
|
300 | 296 |
} |
301 | 297 |
|
302 | 298 |
# Stops the master role |
303 | 299 |
stop_master() { |
304 |
if _confd_enabled ; then |
|
305 |
stop ganeti-luxid |
|
306 |
fi |
|
300 |
stop ganeti-luxid |
|
307 | 301 |
stop ganeti-rapi |
308 | 302 |
stop ganeti-masterd |
309 | 303 |
} |
b/test/py/daemon-util_unittest.bash | ||
---|---|---|
36 | 36 |
err "Please update $0, mond enable feature is missing" |
37 | 37 |
fi |
38 | 38 |
|
39 |
DAEMONS_LIST="noded masterd rapi" |
|
40 |
STOPDAEMONS_LIST="rapi masterd noded" |
|
39 |
DAEMONS_LIST="noded masterd rapi luxid"
|
|
40 |
STOPDAEMONS_LIST="luxid rapi masterd noded"
|
|
41 | 41 |
|
42 | 42 |
if grep -q '^ENABLE_CONFD = True' lib/_constants.py; then |
43 |
DAEMONS_LIST="$DAEMONS_LIST confd luxid"
|
|
44 |
STOPDAEMONS_LIST="luxid confd $STOPDAEMONS_LIST"
|
|
43 |
DAEMONS_LIST="$DAEMONS_LIST confd" |
|
44 |
STOPDAEMONS_LIST="confd $STOPDAEMONS_LIST" |
|
45 | 45 |
fi |
46 | 46 |
|
47 | 47 |
if grep -q '^ENABLE_MOND = True' lib/_constants.py; then |
Also available in: Unified diff