Revision 5a904197 lib/bootstrap.py

b/lib/bootstrap.py
387 387
  @param default_dir: default file storage directory when C{file_storage_dir}
388 388
      is 'None'
389 389
  @type file_disk_template: string
390
  @param file_disk_template: a disk template whose storage type is 'ST_FILE'
390
  @param file_disk_template: a disk template whose storage type is 'ST_FILE' or
391
      'ST_SHARED_FILE'
391 392
  @rtype: string
392 393
  @returns: the name of the actual file storage directory
393 394

  
394 395
  """
395
  assert (file_disk_template in
396
          utils.storage.GetDiskTemplatesOfStorageType(constants.ST_FILE))
396
  assert (file_disk_template in utils.storage.GetDiskTemplatesOfStorageTypes(
397
            constants.ST_FILE, constants.ST_SHARED_FILE
398
         ))
399

  
397 400
  if file_storage_dir is None:
398 401
    file_storage_dir = default_dir
399 402
  if not acceptance_fn:

Also available in: Unified diff