openstack/openstack-ansible-os_nova
Code Issues Proposed changes

Fix scheduler_host_manager regression

Browse Source 
Review [1] introduced a regression that reverted the updated value for
scheduler_host_manager made in review [2].  This old value worked fine
prior to newton but causes nova to fail to restart on newton.

This commit also removes the stale nova_scheduler_host_manager variable
which should no longer get used.

[1] https://review.openstack.org/#/c/293315/
[2] https://review.openstack.org/#/c/298450/

Change-Id: Iedf3892d6317cb3566e40460bdbb05d15b4641ae
This commit is contained in:
Matt Thompson 2016-04-20 13:45:03 +01:00
parent bb632de8b7
commit a902528a24
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
defaults/main.yml
View File

@ -100,7 +100,7 @@ nova_rpc_response_timeout: 60
nova_virt_types: nova_virt_types:
ironic: ironic:
nova_compute_driver: nova.virt.ironic.IronicDriver nova_compute_driver: nova.virt.ironic.IronicDriver
nova_scheduler_host_manager: nova.scheduler.ironic_host_manager.IronicHostManager nova_scheduler_host_manager: ironic_host_manager
nova_reserved_host_memory_mb: 0 nova_reserved_host_memory_mb: 0
# NOTE(mrda): It's possible to use ironic.nova.compute.manager.ClusteredComputeManager # NOTE(mrda): It's possible to use ironic.nova.compute.manager.ClusteredComputeManager
# here, but at the current time it's not recommended # here, but at the current time it's not recommended
@ -110,7 +110,7 @@ nova_virt_types:
nova_scheduler_tracks_instance_changes: False nova_scheduler_tracks_instance_changes: False
kvm: kvm:
nova_compute_driver: libvirt.LibvirtDriver nova_compute_driver: libvirt.LibvirtDriver
nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager nova_scheduler_host_manager: host_manager
nova_reserved_host_memory_mb: 2048 nova_reserved_host_memory_mb: 2048
nova_compute_manager: nova.compute.manager.ComputeManager nova_compute_manager: nova.compute.manager.ComputeManager
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
@ -118,7 +118,7 @@ nova_virt_types:
nova_scheduler_tracks_instance_changes: True nova_scheduler_tracks_instance_changes: True
qemu: qemu:
nova_compute_driver: libvirt.LibvirtDriver nova_compute_driver: libvirt.LibvirtDriver
nova_scheduler_host_manager: nova.scheduler.host_manager.HostManager nova_scheduler_host_manager: host_manager
nova_reserved_host_memory_mb: 2048 nova_reserved_host_memory_mb: 2048
nova_compute_manager: nova.compute.manager.ComputeManager nova_compute_manager: nova.compute.manager.ComputeManager
nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver nova_firewall_driver: nova.virt.firewall.NoopFirewallDriver
@ -285,7 +285,6 @@ nova_scheduler_max_attempts: 5
nova_scheduler_default_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateCoreFilter,AggregateDiskFilter" nova_scheduler_default_filters: "RetryFilter,AvailabilityZoneFilter,RamFilter,ComputeFilter,ComputeCapabilitiesFilter,ImagePropertiesFilter,ServerGroupAntiAffinityFilter,ServerGroupAffinityFilter,AggregateCoreFilter,AggregateDiskFilter"
nova_scheduler_driver: filter_scheduler nova_scheduler_driver: filter_scheduler
nova_scheduler_available_filters: nova.scheduler.filters.all_filters nova_scheduler_available_filters: nova.scheduler.filters.all_filters
nova_scheduler_host_manager: host_manager
nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers nova_scheduler_weight_classes: nova.scheduler.weights.all_weighers
nova_scheduler_program_name: nova-scheduler nova_scheduler_program_name: nova-scheduler