Browse code

Baremetal should start using scheduler filters.

The baremetal driver should start using scheduler filters, particularly
the RetryFilter and ComputeFilter, as some functionality in Nova depends
on these.

However, the ComputeCapabilitiesFilter currently does not work with
baremetal in devstack due to an order-of-operations issue, so we
explicitly list the other filters that we do want.

Change-Id: Icc4b074c6f99e3e4ffbcf5eef0f9bb6f0f5c1996

Devananda van der Veen authored on 2013/02/13 14:58:33
Showing 1 changed files
... ...
@@ -1073,9 +1073,11 @@ if is_service_enabled nova; then
1073 1073
         iniset $NOVA_CONF DEFAULT compute_driver nova.virt.baremetal.driver.BareMetalDriver
1074 1074
         iniset $NOVA_CONF DEFAULT firewall_driver $LIBVIRT_FIREWALL_DRIVER
1075 1075
         iniset $NOVA_CONF DEFAULT scheduler_host_manager nova.scheduler.baremetal_host_manager.BaremetalHostManager
1076
-        iniset $NOVA_CONF DEFAULT scheduler_default_filters AllHostsFilter
1077
-        iniset $NOVA_CONF baremetal driver $BM_DRIVER
1076
+        # NOTE(deva): ComputeCapabilitiesFilter does not currently work with Baremetal. See bug # 1129485
1077
+        #             As a work around, we disable CCFilter by explicitly enabling all the other default filters.
1078
+        iniset $NOVA_CONF DEFAULT scheduler_default_filters ComputeFilter,RetryFilter,AvailabilityZoneFilter,ImagePropertiesFilter
1078 1079
         iniset $NOVA_CONF baremetal instance_type_extra_specs cpu_arch:$BM_CPU_ARCH
1080
+        iniset $NOVA_CONF baremetal driver $BM_DRIVER
1079 1081
         iniset $NOVA_CONF baremetal power_manager $BM_POWER_MANAGER
1080 1082
         iniset $NOVA_CONF baremetal tftp_root /tftpboot
1081 1083