Commit d1e9c98d authored by Iustin Pop's avatar Iustin Pop
Browse files

Automatically enable hail if enabled and found


Signed-off-by: default avatarIustin Pop <iustin@google.com>
Reviewed-by: default avatarMichael Hanselmann <hansmi@google.com>
parent e5395072
...@@ -428,6 +428,12 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913 ...@@ -428,6 +428,12 @@ def InitCluster(cluster_name, mac_prefix, # pylint: disable-msg=R0913
raise errors.OpPrereqError("Invalid default iallocator script '%s'" raise errors.OpPrereqError("Invalid default iallocator script '%s'"
" specified" % default_iallocator, " specified" % default_iallocator,
errors.ECODE_INVAL) errors.ECODE_INVAL)
elif constants.HTOOLS:
# htools was enabled at build-time, we default to it
if utils.FindFile(constants.IALLOC_HAIL,
constants.IALLOCATOR_SEARCH_PATH,
os.path.isfile):
default_iallocator = constants.IALLOC_HAIL
now = time.time() now = time.time()
......
...@@ -228,10 +228,6 @@ value for wiping disks prior to allocation. This increases security ...@@ -228,10 +228,6 @@ value for wiping disks prior to allocation. This increases security
on instance level as the instance can't access untouched data from on instance level as the instance can't access untouched data from
it's underlying storage. it's underlying storage.
xen-pvm xen-pvm
Xen PVM hypervisor Xen PVM hypervisor
...@@ -331,14 +327,16 @@ user-id pool is initialized to an empty list. An empty list means ...@@ -331,14 +327,16 @@ user-id pool is initialized to an empty list. An empty list means
that the user-id pool feature is disabled. that the user-id pool feature is disabled.
The ``-I (--default-iallocator)`` option specifies the default The ``-I (--default-iallocator)`` option specifies the default
instance allocator. The instance allocator will be used for instance allocator. The instance allocator will be used for operations
operations like instance creation, instance and node migration, like instance creation, instance and node migration, etc. when no
etc. when no manual override is specified. If this option is not manual override is specified. If this option is not specified and
specified, the default instance allocator will be blank, which htools was not enabled at build time, the default instance allocator
means that relevant operations will require the administrator to will be blank, which means that relevant operations will require the
manually specify either an instance allocator, or a set of nodes. administrator to manually specify either an instance allocator, or a
The default iallocator can be changed later using the **modify** set of nodes. If the option is not specified but htools was enabled,
command. the default iallocator will be **hail**(1) (assuming it can be found
on disk). The default iallocator can be changed later using the
**modify** command.
The ``--primary-ip-version`` option specifies the IP version used The ``--primary-ip-version`` option specifies the IP version used
for the primary address. Possible values are 4 and 6 for IPv4 and for the primary address. Possible values are 4 and 6 for IPv4 and
......
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