Skip to content

Commit 1ade00d

Browse files
committed
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
1 parent dc9ef55 commit 1ade00d

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

lib/nova

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ function create_nova_conf {
454454
iniset $NOVA_CONF wsgi api_paste_config "$NOVA_API_PASTE_INI"
455455
iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf"
456456
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"
458458
iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME"
459459
if [[ $SERVICE_IP_VERSION == 6 ]]; then
460460
iniset $NOVA_CONF DEFAULT my_ip "$HOST_IPV6"

lib/nova_plugins/hypervisor-fake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function configure_nova_hypervisor {
4949
iniset $NOVA_CONF DEFAULT quota_security_groups -1
5050
iniset $NOVA_CONF DEFAULT quota_security_group_rules -1
5151
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"
5353
}
5454

5555
# install_nova_hypervisor() - Install external components

0 commit comments

Comments
 (0)