commit 435f9dc6636e51c8d06e8441c0ab4fc3384ec499
Merge: 2708745 5be8371
Author: Klaus Aehlig <[email protected]>
Date: Thu Jul 10 15:41:39 2014 +0200
Merge branch 'stable-2.10' into stable-2.11
* stable-2.10
Make gnt-cluster upgrade honor backup-dir
Add a new --with-backup-dir configure option
Fix BlockdevSnapshot in case of non lvm-based disk
Fix RAPI in case split query mechanism is used
Allow disk hot-remove even with chroot or SM
Remove superflous loop in instance queries
Conflicts:
lib/cmdlib/instance_query.py: take version from 2.11
diff --cc lib/pathutils.py
index db860ff,5a21562..250b201
--- a/lib/pathutils.py
+++ b/lib/pathutils.py
@@@ -34,10 -34,8 +34,11 @@@ DEFAULT_FILE_STORAGE_DIR = vcluster.Add
DEFAULT_SHARED_FILE_STORAGE_DIR = "/srv/ganeti/shared-file-storage"
DEFAULT_SHARED_FILE_STORAGE_DIR = \
vcluster.AddNodePrefix(DEFAULT_SHARED_FILE_STORAGE_DIR)
+DEFAULT_GLUSTER_STORAGE_DIR = "/var/run/ganeti/gluster"
+DEFAULT_GLUSTER_STORAGE_DIR = \
+ vcluster.AddNodePrefix(DEFAULT_GLUSTER_STORAGE_DIR)
EXPORT_DIR = vcluster.AddNodePrefix(_constants.EXPORT_DIR)
+ BACKUP_DIR = vcluster.AddNodePrefix(_constants.BACKUP_DIR)
OS_SEARCH_PATH = _constants.OS_SEARCH_PATH
ES_SEARCH_PATH = _constants.ES_SEARCH_PATH
--
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
