Browse code

Merge "Stop using ironic host manager with resource classes"

Jenkins authored on 2017/10/06 12:17:02
Showing 1 changed files
... ...
@@ -41,9 +41,9 @@ function configure_nova_hypervisor {
41 41
 
42 42
     iniset $NOVA_CONF DEFAULT compute_driver ironic.IronicDriver
43 43
     iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
44
-    iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
45 44
 
46 45
     if [[ "$IRONIC_USE_RESOURCE_CLASSES" == "False" ]]; then
46
+        iniset $NOVA_CONF DEFAULT scheduler_host_manager ironic_host_manager
47 47
         iniset $NOVA_CONF filter_scheduler use_baremetal_filters True
48 48
         iniset $NOVA_CONF filter_scheduler host_subset_size 999
49 49
         iniset $NOVA_CONF DEFAULT ram_allocation_ratio 1.0