Browse code

Disable baremetal sched filters when using resource classes

When using resource classes to schedule baremetal nodes the baremetal
filters like ExactRam etc should not be used. This patch disables them
in the nova config if devstack is configured to enable ironic resource
classes.

Change-Id: Ic262ccaf8b541308042d61113a953653d2261964

Sam Betts authored on 2017/08/03 20:41:36
Showing 1 changed files
... ...
@@ -42,7 +42,11 @@ function configure_nova_hypervisor {
42 42
     iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver
43 43
     iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
44 44
     iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
45
-    iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
45
+
46
+    if [[ "$IRONIC_USE_RESOURCE_CLASSES" == "False" ]]; then
47
+        iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
48
+    fi
49
+
46 50
     iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
47 51
     iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
48 52
     # ironic section