Commit 8c37d618 authored by Michael Hanselmann's avatar Michael Hanselmann
Browse files

daemon-util: Support virtual clusters



GANETI_ROOTDIR contains the root directory for the current “virtual node”.
Signed-off-by: default avatarMichael Hanselmann <hansmi@google.com>
Reviewed-by: default avatarRené Nussbaumer <rn@google.com>
parent 05e733b4
...@@ -20,7 +20,8 @@ ...@@ -20,7 +20,8 @@
set -e set -e
defaults_file=@SYSCONFDIR@/default/ganeti readonly defaults_file="${GANETI_ROOTDIR}@SYSCONFDIR@/default/ganeti"
readonly localstatedir="${GANETI_ROOTDIR}@LOCALSTATEDIR@"
# This is a list of all daemons and the order in which they're started. The # This is a list of all daemons and the order in which they're started. The
# order is important as there are dependencies between them. On shutdown, # order is important as there are dependencies between them. On shutdown,
...@@ -52,7 +53,7 @@ _ignore_error() { ...@@ -52,7 +53,7 @@ _ignore_error() {
} }
_daemon_pidfile() { _daemon_pidfile() {
echo "@LOCALSTATEDIR@/run/ganeti/$1.pid" echo "$localstatedir/run/ganeti/$1.pid"
} }
_daemon_executable() { _daemon_executable() {
...@@ -81,7 +82,7 @@ _daemon_usergroup() { ...@@ -81,7 +82,7 @@ _daemon_usergroup() {
# Checks whether the local machine is part of a cluster # Checks whether the local machine is part of a cluster
check_config() { check_config() {
local server_pem=@LOCALSTATEDIR@/lib/ganeti/server.pem local server_pem=$localstatedir/lib/ganeti/server.pem
local fname local fname
for fname in $server_pem; do for fname in $server_pem; do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment