commit 69c78404ee2fc87ac6fd2ef9439fdee428f1edea
author Jenkins <jenkins@review.openstack.org> Thu Aug 10 15:17:29 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Aug 10 15:17:30 2017 +0000
tree bafa89b89115cfbf68f4db3e8fa9ce0788d707c2
parent 801494550a58220e1bcbd531e810e1ca59efa7e8
parent 139837d69d8566088125d29739089aec7b2a9e7c

Merge "Make TLS logs more readable"

lib/nova_plugins/hypervisor-ironic

diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic
index 7d47ef0..d59473c 100644
--- a/lib/nova_plugins/hypervisor-ironic
+++ b/lib/nova_plugins/hypervisor-ironic
@@ -42,7 +42,11 @@
     iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver
     iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
     iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
-    iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
+
+    if [[ "$IRONIC_USE_RESOURCE_CLASSES" == "False" ]]; then
+        iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
+    fi
+
     iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0
     iniset $NOVA_CONF DEFAULT reserved_host_memory_mb 0
     # ironic section