From 1ade00da55cfc383b4832f8da03df01001b40fcd Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Mon, 5 Jun 2017 11:01:45 -0400 Subject: [PATCH] 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 --- lib/nova | 2 +- lib/nova_plugins/hypervisor-fake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nova b/lib/nova index e580abb4b0..9c3ba33013 100644 --- a/lib/nova +++ b/lib/nova @@ -454,7 +454,7 @@ function create_nova_conf { iniset $NOVA_CONF wsgi api_paste_config "$NOVA_API_PASTE_INI" iniset $NOVA_CONF DEFAULT rootwrap_config "$NOVA_CONF_DIR/rootwrap.conf" iniset $NOVA_CONF DEFAULT scheduler_driver "$SCHEDULER" - iniset $NOVA_CONF DEFAULT scheduler_default_filters "$FILTERS" + iniset $NOVA_CONF filter_scheduler enabled_filters "$FILTERS" iniset $NOVA_CONF DEFAULT default_floating_pool "$PUBLIC_NETWORK_NAME" if [[ $SERVICE_IP_VERSION == 6 ]]; then iniset $NOVA_CONF DEFAULT my_ip "$HOST_IPV6" diff --git a/lib/nova_plugins/hypervisor-fake b/lib/nova_plugins/hypervisor-fake index f9b95c1816..49c8dee83a 100644 --- a/lib/nova_plugins/hypervisor-fake +++ b/lib/nova_plugins/hypervisor-fake @@ -49,7 +49,7 @@ function configure_nova_hypervisor { iniset $NOVA_CONF DEFAULT quota_security_groups -1 iniset $NOVA_CONF DEFAULT quota_security_group_rules -1 iniset $NOVA_CONF DEFAULT quota_key_pairs -1 - iniset $NOVA_CONF DEFAULT scheduler_default_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter" + iniset $NOVA_CONF filter_scheduler enabled_filters "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,CoreFilter,RamFilter,DiskFilter" } # install_nova_hypervisor() - Install external components