From 1b4d87b33f93ab41721a77b1adc5c837833570be Mon Sep 17 00:00:00 2001 From: tianhui Date: Mon, 4 Jun 2018 10:14:49 +0800 Subject: [PATCH] Fix bug to filter_scheduler In https://docs.openstack.org/nova/latest/configuration/config.html#filter_scheduler.max_instances_per_host refers to the "num_instances_filter" but that's the name of the python module, not the actual filter. So the config option help text should be updated to use the actual filter names that would go in the 'enabled_filters' option, not the python module in which those filters live. Change-Id: Icf7e64ed45fa5013714d85ea22794f106d4e387c Closes-bug: #1774676 --- nova/conf/scheduler.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nova/conf/scheduler.py b/nova/conf/scheduler.py index 54ff66cda620..b391922d871d 100644 --- a/nova/conf/scheduler.py +++ b/nova/conf/scheduler.py @@ -240,13 +240,14 @@ Possible values: Maximum number of instances that be active on a host. If you need to limit the number of instances on any given host, set this option -to the maximum number of instances you want to allow. The num_instances_filter -will reject any host that has at least as many instances as this option's -value. +to the maximum number of instances you want to allow. The NumInstancesFilter +and AggregateNumInstancesFilter will reject any host that has at least as many +instances as this option's value. This option is only used by the FilterScheduler and its subclasses; if you use a different scheduler, this option has no effect. Also note that this setting -only affects scheduling if the 'num_instances_filter' filter is enabled. +only affects scheduling if the 'NumInstancesFilter' or +'AggregateNumInstancesFilter' filter is enabled. Possible values: