Browse code

Merge "Enable SameHostFilter and DifferentHostFilter"

Jenkins authored on 2016/01/06 22:37:37
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
... ...
@@ -473,6 +477,7 @@ function create_nova_conf {
473 473
     iniset $NOVA_CONF DEFAULT api_paste_config "$NOVA_API_PASTE_INI"
474 474
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
475 475
     iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
476
+    iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS"
476 477
     iniset $NOVA_CONF DEFAULT dhcpbridge_flagfile "$NOVA_CONF"
477 478
     iniset $NOVA_CONF DEFAULT force_dhcp_release "True"
478 479
     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"