From 857aa5a90f88eb86a4ddd857cf991f3d9e143017 Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Wed, 2 May 2018 12:11:05 -0400 Subject: [PATCH] Remove ironic_host_manager usage The baremetal scheduling options were deprecated in Pike and the ironic_host_manager was deprecated in Queens and has now been removed. Deployments must use resource classes now for baremetal scheduling. While we're in here, the scheduler_host_manager usage is removed altogether because it was removed from nova: https://review.openstack.org/#/c/565806/ Depends-On: https://review.openstack.org/565805/ Change-Id: I33f51235a7f1818ff4bfca74bc236dede4bc65f1 --- defaults/main.yml | 5 ----- templates/nova.conf.j2 | 1 - 2 files changed, 6 deletions(-) diff --git a/defaults/main.yml b/defaults/main.yml index 9e519351..9f40eb79 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -130,29 +130,24 @@ nova_rabbitmq_telemetry_use_ssl: "{{ nova_rabbitmq_use_ssl }}" nova_virt_types: ironic: nova_compute_driver: ironic.IronicDriver - nova_scheduler_host_manager: ironic_host_manager nova_reserved_host_memory_mb: 0 nova_scheduler_tracks_instance_changes: False kvm: nova_compute_driver: libvirt.LibvirtDriver - nova_scheduler_host_manager: host_manager nova_reserved_host_memory_mb: 2048 nova_scheduler_tracks_instance_changes: True lxd: nova_compute_driver: lxd.LXDDriver - nova_scheduler_host_manager: host_manager nova_reserved_host_memory_mb: 2048 nova_compute_manager: nova.compute.manager.ComputeManager nova_scheduler_tracks_instance_changes: True qemu: nova_compute_driver: libvirt.LibvirtDriver - nova_scheduler_host_manager: host_manager nova_reserved_host_memory_mb: 2048 nova_scheduler_tracks_instance_changes: True nova_cpu_mode: "none" powervm: nova_compute_driver: powervm.driver.PowerVMDriver - nova_scheduler_host_manager: host_manager nova_reserved_host_memory_mb: 8192 nova_scheduler_tracks_instance_changes: True diff --git a/templates/nova.conf.j2 b/templates/nova.conf.j2 index 23cf5cee..91fe7046 100644 --- a/templates/nova.conf.j2 +++ b/templates/nova.conf.j2 @@ -303,7 +303,6 @@ vendordata_jsonfile_path = /etc/nova/vendor_data.json max_attempts = {{ nova_scheduler_max_attempts }} scheduler_driver = {{ nova_scheduler_driver }} periodic_task_interval = {{ nova_scheduler_driver_task_period }} -host_manager = {{ nova_scheduler_host_manager }} discover_hosts_in_cells_interval = {{ nova_discover_hosts_in_cells_interval }} [filter_scheduler]