commit 401f43d4e197853091b51b4af99f14146b7cab46
author Jenkins <jenkins@review.openstack.org> Fri Oct 06 03:17:02 2017 +0000
committer Gerrit Code Review <review@openstack.org> Fri Oct 06 03:17:02 2017 +0000
tree 7b01daad917f254f7ac514e4c76f85435928a4a2
parent 52237ee5482ff8c614dc68088ecaaf7d59a85915
parent def67a47e80c1ed1ed8f1bdcf105563935f6d921

Merge "Stop using ironic host manager with resource classes"

lib/nova_plugins/hypervisor-ironic

diff --git a/lib/nova_plugins/hypervisor-ironic b/lib/nova_plugins/hypervisor-ironic
index 034e403..ee1a0e0 100644
--- a/lib/nova_plugins/hypervisor-ironic
+++ b/lib/nova_plugins/hypervisor-ironic
@@ -41,9 +41,9 @@
 
     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
 
     if [[ "$IRONIC_USE_RESOURCE_CLASSES" == "False" ]]; then
+        iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
         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