From 65102e772e0fdbd5d3b0ac5eebb3179b461d6db0 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 27 May 2020 14:24:09 +0100 Subject: [PATCH] nova: Remove configuration of '[scheduler] driver' This option was deprecated in Ussuri [1] as nova no longer provided any schedulers aside from the filter scheduler and the existence of third-party schedulers was very unlikely. Stop configuring this and simply use the default. [1] https://review.opendev.org/#/c/707225/ Change-Id: Iabdd1d00e00ee269334f0fe0db265a97207e2dc6 Signed-off-by: Stephen Finucane --- lib/nova | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/nova b/lib/nova index a842a61fd0..4da0462dae 100644 --- a/lib/nova +++ b/lib/nova @@ -96,10 +96,6 @@ NOVA_ENABLE_CACHE=${NOVA_ENABLE_CACHE:-True} # NOTE: Set ``FORCE_CONFIG_DRIVE="False"`` to turn OFF config drive FORCE_CONFIG_DRIVE=${FORCE_CONFIG_DRIVE:-"False"} -# Nova supports pluggable schedulers. The default ``FilterScheduler`` -# should work in most cases. -SCHEDULER=${SCHEDULER:-filter_scheduler} - # The following NOVA_FILTERS contains SameHostFilter and DifferentHostFilter with # the default filters. NOVA_FILTERS="AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,SameHostFilter,DifferentHostFilter" @@ -398,11 +394,8 @@ function create_nova_conf { fi 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 scheduler driver "$SCHEDULER" iniset $NOVA_CONF filter_scheduler enabled_filters "$NOVA_FILTERS" - if [[ $SCHEDULER == "filter_scheduler" ]]; then - iniset $NOVA_CONF scheduler workers "$API_WORKERS" - fi + iniset $NOVA_CONF scheduler workers "$API_WORKERS" iniset $NOVA_CONF neutron default_floating_pool "$PUBLIC_NETWORK_NAME" if [[ $SERVICE_IP_VERSION == 6 ]]; then iniset $NOVA_CONF DEFAULT my_ip "$HOST_IPV6"