Commit 1fbb19fa authored by Iustin Pop's avatar Iustin Pop
Browse files

Fix handling of disabled (shared) file storage



The vcluster changes broke the disabling of file storage; we can
workaround by (manually) skipping the virtualisation of file storage
paths if they are not enabled.

Note that tests/QA are still broken with disabled file storage; this
patch only fixes production code.
Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarGuido Trotter <ultrotter@google.com>
parent bfa99f7a
# #
# #
# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc. # Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Google Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
...@@ -29,9 +29,15 @@ from ganeti import vcluster ...@@ -29,9 +29,15 @@ from ganeti import vcluster
# Build-time constants # Build-time constants
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(_autoconf.FILE_STORAGE_DIR) if _autoconf.ENABLE_FILE_STORAGE:
DEFAULT_SHARED_FILE_STORAGE_DIR = \ DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(_autoconf.FILE_STORAGE_DIR)
vcluster.AddNodePrefix(_autoconf.SHARED_FILE_STORAGE_DIR) else:
DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
if _autoconf.ENABLE_SHARED_FILE_STORAGE:
DEFAULT_SHARED_FILE_STORAGE_DIR = \
vcluster.AddNodePrefix(_autoconf.SHARED_FILE_STORAGE_DIR)
else:
DEFAULT_SHARED_FILE_STORAGE_DIR = _autoconf.SHARED_FILE_STORAGE_DIR
EXPORT_DIR = vcluster.AddNodePrefix(_autoconf.EXPORT_DIR) EXPORT_DIR = vcluster.AddNodePrefix(_autoconf.EXPORT_DIR)
OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH OS_SEARCH_PATH = _autoconf.OS_SEARCH_PATH
ES_SEARCH_PATH = _autoconf.ES_SEARCH_PATH ES_SEARCH_PATH = _autoconf.ES_SEARCH_PATH
......
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