From b79be36cdb9e0368d7976e0876ee1273110d5b5c Mon Sep 17 00:00:00 2001 From: Vladyslav Drok Date: Wed, 30 Aug 2017 19:19:56 +0300 Subject: [PATCH] Remove setting some of the scheduler settings It makes sense to set them only if resource classes are not used. Change-Id: I76d8501a1d1a20357acadad4cd8f2d6cef3896c1 --- lib/nova_plugins/hypervisor-ironic | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic index 062afb7f7c..034e403768 100644 --- a/lib/nova_plugins/hypervisor-ironic +++ b/lib/nova_plugins/hypervisor-ironic @@ -45,12 +45,11 @@ function configure_nova_hypervisor { if [[ "$IRONIC_USE_RESOURCE_CLASSES" == "False" ]]; then iniset $NOVA_CONF filter_scheduler use_baremetal_filters True + iniset $NOVA_CONF filter_scheduler host_subset_size 999 + iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 + iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 fi - iniset $NOVA_CONF filter_scheduler host_subset_size 999 - - iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0 - iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0 # ironic section iniset $NOVA_CONF ironic auth_type password iniset $NOVA_CONF ironic username admin