1. devstack
  2. Commit 1ade00da55cfc383b4832f8da03df01001b40fcd
Browse code

Fix scheduler_default_filters usage

The scheduler_default_filters config option moved out of the
DEFAULT option group into a more specific group, and the old
option is deprecated as a result so we need to update our usage.

Change-Id: I5d6574d19c3f16abadddb19f34cb645dcdcc07f4

Matt Riedemann authored on 2017/06/06 00:01:45
Showing 2 changed files
lib/nova
History View file @ 1ade00d
... ... 
@@ -454,7 +454,7 @@ function create_nova_conf {
454 454 
     iniset $NOVA_CONF wsgi api_paste_config "$NOVA_API_PASTE_INI"
455 455 
     iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
456 456 
     iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER"
457 
-    iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS"
457 
+    iniset $NOVA_CONF filter_scheduler enabled_filters "$FILTERS"
458 458 
     iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"
459 459 
     if [[ $SERVICE_IP_VERSION == 6 ]]; then
460 460 
         iniset $NOVA_CONF DEFAULT my_ip "$HOST_IPV6"
lib/nova_plugins/hypervisor-fake
History View file @ 1ade00d
... ... 
@@ -49,7 +49,7 @@ function configure_nova_hypervisor {
49 49 
     iniset $NOVA_CONF DEFAULT quota_security_groups -1
50 50 
     iniset $NOVA_CONF DEFAULT quota_security_group_rules -1
51 51 
     iniset $NOVA_CONF DEFAULT quota_key_pairs -1
52 
-    iniset $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter"
52 
+    iniset $NOVA_CONF filter_scheduler enabled_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter"
53 53 
 }
54 54
55 55 
 # install_nova_hypervisor() - Install external components