Remove file storage path from autoconf

This patch removes the option to configure the file
storage path at configure time, because it is now
replaced by a runtime option for gnt-cluster init.

Signed-off-by: Helga Velroyen <helgav@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --git a/Makefile.am b/Makefile.am
index 917cf75..568bdab 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1576,7 +1576,6 @@ lib/_autoconf.py: Makefile | stamp-directories
          echo "XEN_KERNEL = '$(XEN_KERNEL)'"; \
          echo "XEN_INITRD = '$(XEN_INITRD)'"; \
          echo "KVM_KERNEL = '$(KVM_KERNEL)'"; \
-         echo "FILE_STORAGE_DIR = '$(FILE_STORAGE_DIR)'"; \
          echo "SHARED_FILE_STORAGE_DIR = '$(SHARED_FILE_STORAGE_DIR)'"; \
          echo "ENABLE_SHARED_FILE_STORAGE = $(ENABLE_SHARED_FILE_STORAGE)"; \
          echo "IALLOCATOR_SEARCH_PATH = [$(IALLOCATOR_SEARCH_PATH)]"; \

diff --git a/configure.ac b/configure.ac
index 32430a3..32b9c15 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -128,15 +128,6 @@ AC_ARG_WITH([kvm-kernel],
   [kvm_kernel="/boot/vmlinuz-3-kvmU"])
 AC_SUBST(KVM_KERNEL, $kvm_kernel)
 
-# --with-file-storage-dir=...
-AC_ARG_WITH([file-storage-dir],
-  [AS_HELP_STRING([--with-file-storage-dir=PATH],
-    [directory to store files for file-based backend]
-    [ (default is /srv/ganeti/file-storage)]
-  )],
-  [[file_storage_dir="/srv/ganeti/file-storage"]])
-AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
-
 # --with-shared-file-storage-dir=...
 AC_ARG_WITH([shared-file-storage-dir],
   [AS_HELP_STRING([--with-shared-file-storage-dir=PATH],

diff --git a/lib/pathutils.py b/lib/pathutils.py
index c8e6d8e..496ceea 100644 (file)
--- a/lib/pathutils.py
+++ b/lib/pathutils.py
@@ -28,13 +28,8 @@ from ganeti import compat
 from ganeti import vcluster
 
 
-# FIXME: remove autoconf override
-DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage"
-
 # Build-time constants
-# FIXME: remove autoconf storage dir
-if _autoconf.FILE_STORAGE_DIR:
-  DEFAULT_FILE_STORAGE_DIR = _autoconf.FILE_STORAGE_DIR
+DEFAULT_FILE_STORAGE_DIR = "/srv/ganeti/file-storage"
 DEFAULT_FILE_STORAGE_DIR = vcluster.AddNodePrefix(DEFAULT_FILE_STORAGE_DIR)
 
 if _autoconf.ENABLE_SHARED_FILE_STORAGE:

diff --git a/test/hs/Test/Ganeti/Types.hs b/test/hs/Test/Ganeti/Types.hs
index 3eff2f0..cdd5409 100644 (file)
--- a/test/hs/Test/Ganeti/Types.hs
+++ b/test/hs/Test/Ganeti/Types.hs
@@ -83,13 +83,10 @@ $(genArbitrary ''AllocPolicy)
 allDiskTemplates :: [DiskTemplate]
 allDiskTemplates =
   let all_vals = [minBound..maxBound]::[DiskTemplate]
-      sel1 = if C.enableFileStorage
+      sel1 = if C.enableSharedFileStorage
                then all_vals
-               else delete DTFile all_vals
-      sel2 = if C.enableSharedFileStorage
-               then sel1
-               else delete DTSharedFile sel1
-  in sel2
+               else delete DTSharedFile all_vals
+  in sel1
 
 -- | Custom 'Arbitrary' instance for 'DiskTemplate', which needs to
 -- handle the case of file storage being disabled at configure time.
@@ -114,11 +111,7 @@ $(genArbitrary ''OobCommand)
 
 -- | Valid storage types.
 allStorageTypes :: [StorageType]
-allStorageTypes =
-  let all_vals = [minBound..maxBound]::[StorageType]
-  in if C.enableFileStorage
-       then all_vals
-       else delete StorageFile all_vals
+allStorageTypes = [minBound..maxBound]::[StorageType]
 
 -- | Custom 'Arbitrary' instance for 'StorageType', which needs to
 -- handle the case of file storage being disabled at configure time.