Skip to content

Commit a2d5815

Browse files
committed
nova: Remove deprecated options (SOC-7852)
Removed some deprecated options related to ironic/baremetal deployments.
1 parent 5977d44 commit a2d5815

2 files changed

Lines changed: 0 additions & 9 deletions

File tree

chef/cookbooks/nova/recipes/config.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@
258258

259259
ironic_servers = node_search_with_cache("roles:ironic-server") || []
260260
if ironic_servers.any? && (node["roles"] & ["nova-compute-ironic", "nova-controller"]).any?
261-
use_baremetal_filters = true
262261
track_instance_changes = false
263262
ironic_node = ironic_servers.first
264263
ironic_settings = {}
@@ -273,7 +272,6 @@
273272
ironic_settings[:service_password] = ironic_node[:ironic][:service_password]
274273
reserved_host_memory = 0
275274
else
276-
use_baremetal_filters = false
277275
track_instance_changes = true
278276
ironic_settings = nil
279277
reserved_host_memory = node[:nova][:scheduler][:reserved_host_memory_mb]
@@ -420,7 +418,6 @@
420418
has_itxt: has_itxt,
421419
enabled_filters: node[:nova][:scheduler][:enabled_filters],
422420
reserved_host_memory: reserved_host_memory,
423-
use_baremetal_filters: use_baremetal_filters,
424421
track_instance_changes: track_instance_changes,
425422
ironic_settings: ironic_settings,
426423
ephemeral_rbd_settings: ephemeral_rbd_settings,

chef/cookbooks/nova/templates/default/nova.conf.erb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ key = <%= @vncproxy_key_file %>
66
instance_name_template=zvm%05x
77
<% end %>
88
my_ip = <%= node[:nova][:my_ip] %>
9-
<% unless @ironic_settings.nil? %>
10-
scheduler_host_manager = ironic_host_manager
11-
<% end %>
129
state_path = /var/lib/nova
1310
enabled_ssl_apis = <%= @ssl_enabled ? "osapi_compute,metadata" : "" %>
1411
osapi_compute_listen = <%= @bind_host %>
@@ -354,9 +351,6 @@ host_manager = ironic_host_manager
354351
<% end %>
355352

356353
[filter_scheduler]
357-
<% if @use_baremetal_filters %>
358-
use_baremetal_filters = true
359-
<% end %>
360354
<% if @has_itxt %>
361355
available_filters = nova.scheduler.filters.standard_filters
362356
<% if @enabled_filters.empty? %>

0 commit comments

Comments
 (0)