Browse code

Enable SameHostFilter and DifferentHostFilter

The default filters of nova don't contain SameHostFilter and
DifferentHostFilter, so we cannot test them on the gate.
This patch makes these filters available for the development.

Change-Id: Ia6b4847e9bb21048d254d0a460ae4c5be896b17b
Closes-Bug: #1526620

Ken'ichi Ohmichi authored on 2015/12/17 17:47:46
Showing 1 changed files
... ...
@@ -98,6 +98,10 @@ FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"True"}
98 98
 # should work in most cases.
99 99
 SCHEDULER=${SCHEDULER:-nova.scheduler.filter_scheduler.FilterScheduler}
100 100
 
101
+# The following FILTERS contains SameHostFilter and DifferentHostFilter with
102
+# the default filters.
103
+FILTERS="RetryFilter,AvailabilityZoneFilter,RamFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter"
104
+
101 105
 QEMU_CONF=/etc/libvirt/qemu.conf
102 106
 
103 107
 # Set default defaults here as some hypervisor drivers override these
... ...
@@ -507,6 +511,7 @@ function create_nova_conf {
507 507
     iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"
508 508
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
509 509
     iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
510
+    iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS"
510 511
     iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"
511 512
     iniset $NOVA_CONF DEFAULT force_dhcp_release "True"
512 513
     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"