Merge "Remove usage of deprecated Disk/RamFilter"

This commit is contained in:
Zuul 2019-05-30 13:34:50 +00:00 committed by Gerrit Code Review
commit 1b7b3ddd38
1 changed files with 4 additions and 4 deletions

View File

@ -8,13 +8,13 @@
# Examples: # Examples:
# ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350' # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350'
# ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0' # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0'
# ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,RamFilter,ComputeFilter"' # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,ComputeFilter"'
# ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,RamFilter,ComputeFilter" host_subset_size=4' # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,ComputeFilter" host_subset_size=4'
# #
# In order for new settings to take affect, you need to restart the Nova services # In order for new settings to take affect, you need to restart the Nova services
# by adding variable restart_nova=true into the extra vars. # by adding variable restart_nova=true into the extra vars.
# #
# ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,RamFilter,ComputeFilter" host_subset_size=4 restart_nova=true' # ansible-playbook -i hosts browbeat/adjustment-nova-scheduler.yml -e 'max_instances_per_host=350 ram_weight_multiplier=0 enabled_filters="NumInstancesFilter,RetryFilter,ComputeFilter" host_subset_size=4 restart_nova=true'
# #
# * Note not setting a variable does not change that configuration item then. Setting no variables # * Note not setting a variable does not change that configuration item then. Setting no variables
# and running the playbook sets all configuration items to defaults (Ocata) # and running the playbook sets all configuration items to defaults (Ocata)
@ -34,7 +34,7 @@
# Defaults # Defaults
default_max_instances_per_host: 50 default_max_instances_per_host: 50
default_ram_weight_multiplier: 1.0 default_ram_weight_multiplier: 1.0
default_enabled_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,DiskFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter" default_enabled_filters: "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter"
default_host_subset_size: 1 default_host_subset_size: 1
# Each configuration item needs to be a list so it can be merged # Each configuration item needs to be a list so it can be merged
max_instances_per_host_item: [] max_instances_per_host_item: []