Revision 49a924bc

b/Makefile.am
1577 1577
	  echo "XEN_INITRD = '$(XEN_INITRD)'"; \
1578 1578
	  echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
1579 1579
	  echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
1580
	  echo "ENABLE_FILE_STORAGE = $(ENABLE_FILE_STORAGE)"; \
1581 1580
	  echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
1582 1581
	  echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
1583 1582
	  echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \
......
1677 1676
	  echo 's#@''CUSTOM_XEN_INITRD@#$(XEN_INITRD)#g'; \
1678 1677
	  echo 's#@''CUSTOM_IALLOCATOR_SEARCH_PATH@#$(IALLOCATOR_SEARCH_PATH)#g'; \
1679 1678
	  echo 's#@''CUSTOM_EXPORT_DIR@#$(EXPORT_DIR)#g'; \
1680
	  echo 's#@''RPL_FILE_STORAGE_DIR@#$(FILE_STORAGE_DIR)#g'; \
1681 1679
	  echo 's#@''RPL_SSH_INITD_SCRIPT@#$(SSH_INITD_SCRIPT)#g'; \
1682 1680
	  echo 's#@''PKGLIBDIR@#$(pkglibdir)#g'; \
1683 1681
	  echo 's#@''GNTMASTERUSER@#$(MASTERD_USER)#g'; \
b/configure.ac
134 134
    [directory to store files for file-based backend]
135 135
    [ (default is /srv/ganeti/file-storage)]
136 136
  )],
137
  [[file_storage_dir="$withval";
138
    if test "$withval" != no; then
139
      enable_file_storage=True
140
    else
141
      enable_file_storage=False
142
    fi
143
  ]],
144
  [[file_storage_dir="/srv/ganeti/file-storage";
145
    enable_file_storage=True]])
137
  [[file_storage_dir="/srv/ganeti/file-storage"]])
146 138
AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
147
AC_SUBST(ENABLE_FILE_STORAGE, $enable_file_storage)
148 139

  
149 140
# --with-shared-file-storage-dir=...
150 141
AC_ARG_WITH([shared-file-storage-dir],
b/lib/constants.py
143 143
SECURE_DIR_MODE = 0700
144 144
SECURE_FILE_MODE = 0600
145 145
ADOPTABLE_BLOCKDEV_ROOT = "/dev/disk/"
146
ENABLE_FILE_STORAGE = _autoconf.ENABLE_FILE_STORAGE
147 146
ENABLE_SHARED_FILE_STORAGE = _autoconf.ENABLE_SHARED_FILE_STORAGE
148 147
ENABLE_CONFD = _autoconf.ENABLE_CONFD
149 148
ENABLE_MOND = _autoconf.ENABLE_MOND
b/lib/objects.py
470 470
        template_set.add(constants.DT_DRBD8)
471 471
        template_set.add(constants.DT_PLAIN)
472 472
      # FIXME: Adapt this when dis/enabling at configure time is removed.
473
      # Enable 'file' and 'sharedfile', if they are enabled, even though they
474
      # might currently not be used.
475
      if constants.ENABLE_FILE_STORAGE:
476
        template_set.add(constants.DT_FILE)
473
      # Enable 'sharedfile', if they are enabled, even though they might
474
      # currently not be used.
477 475
      if constants.ENABLE_SHARED_FILE_STORAGE:
478 476
        template_set.add(constants.DT_SHARED_FILE)
479 477
      # Set enabled_disk_templates to the inferred disk templates. Order them
b/lib/pathutils.py
32 32
DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage"
33 33

  
34 34
# Build-time constants
35
if _autoconf.ENABLE_FILE_STORAGE:
36
  DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(_autoconf.FILE_STORAGE_DIR)
37
else:
35
# FIXME: remove autoconf storage dir
36
if _autoconf.FILE_STORAGE_DIR:
38 37
  DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
38
DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(DEFAULT_FILE_STORAGE_DIR)
39

  
39 40
if _autoconf.ENABLE_SHARED_FILE_STORAGE:
40 41
  DEFAULT_SHARED_FILE_STORAGE_DIR = \
41 42
    vcluster.AddNodePrefix(_autoconf.SHARED_FILE_STORAGE_DIR)
b/man/gnt-backup.rst
180 180
    Disk devices will be drbd (version 8.x) on top of lvm volumes.
181 181

  
182 182
file
183
    Disk devices will be backed up by files, under the directory
184
    ``@RPL_FILE_STORAGE_DIR@``. By default, each instance will get a
185
    directory (as its own name) under this path, and each disk is
186
    stored as individual files in this (instance-specific) directory.
183
    Disk devices will be backed up by files, under the cluster's
184
    default file storage directory. By default, each instance will
185
    get a directory (as its own name) under this path, and each disk
186
    is stored as individual files in this (instance-specific) directory.
187 187

  
188 188

  
189 189
The ``--iallocator`` option specifies the instance allocator plugin
b/man/gnt-instance.rst
805 805
useful for having different subdirectories for different
806 806
instances. The full path of the directory where the disk files are
807 807
stored will consist of cluster-wide file storage directory + optional
808
subdirectory + instance name. Example:
809
``@RPL_FILE_STORAGE_DIR@/mysubdir/instance1.example.com``. This
810
option is only relevant for instances using the file storage backend.
808
subdirectory + instance name. This option is only relevant for
809
instances using the file storage backend.
811 810

  
812 811
The ``--file-driver`` specifies the driver to use for file-based
813 812
disks. Note that currently these drivers work with the xen hypervisor

Also available in: Unified diff