Remove the HTOOLS configuration variable

.. and update the code that uses it.
Signed-off-by: Petr Pudlak <pudlak@google.com>
Reviewed-by: Helga Velroyen <helgav@google.com>

Makefile.am

@@ -1854,7 +1854,6 @@ src/AutoConf.hs: Makefile src/AutoConf.hs.in $(PRINT_PY_CONSTANTS) \
 	    -DMOND_GROUP="$(MOND_GROUP)" \
 	    -DDISK_SEPARATOR="$(DISK_SEPARATOR)" \
 	    -DQEMUIMG_PATH="$(QEMUIMG_PATH)" \
-	    -DHTOOLS="True" \
 	    -DENABLE_CONFD="$(ENABLE_CONFD)" \
 	    -DXEN_CMD="$(XEN_CMD)" \
 	    -DENABLE_RESTRICTED_COMMANDS="$(ENABLE_RESTRICTED_COMMANDS)" \

autotools/build-bash-completion

@@ -848,10 +848,9 @@ def main():
   WriteHaskellCompletion(sw, "daemons/ganeti-cleaner", htools=False,
                          debug=not options.compact)
 
-  # htools, if enabled
-  if _constants.HTOOLS:
-    for script in _constants.HTOOLS_PROGS:
-      WriteHaskellCompletion(sw, script, htools=True, debug=debug)
+  # htools
+  for script in _constants.HTOOLS_PROGS:
+    WriteHaskellCompletion(sw, script, htools=True, debug=debug)
 
   # ganeti-confd, if enabled
   if _constants.ENABLE_CONFD:

lib/bootstrap.py

@@ -735,8 +735,8 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable=R0913, R0914
       raise errors.OpPrereqError("Invalid default iallocator script '%s'"
                                  " specified" % default_iallocator,
                                  errors.ECODE_INVAL)
-  elif constants.HTOOLS:
-    # htools was enabled at build-time, we default to it
+  else:
+    # default to htools
     if utils.FindFile(constants.IALLOC_HAIL,
                       constants.IALLOCATOR_SEARCH_PATH,
                       os.path.isfile):

src/Ganeti/Constants.hs

@@ -4161,13 +4161,6 @@ blockdevDriverManual = Types.blockDriverToRaw BlockDrvManual
 qemuimgPath :: String
 qemuimgPath = AutoConf.qemuimgPath
 
--- | Whether htools was enabled at compilation time
---
--- FIXME: this should be moved next to the other enable constants,
--- such as, 'enableConfd', and renamed to 'enableHtools'.
-htools :: Bool
-htools = AutoConf.htools
-
 -- | The hail iallocator
 iallocHail :: String
 iallocHail = "hail"